diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml index 48f1f4d..427bbc8 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml @@ -66,7 +66,7 @@ left join tb_device_detail tdd on tbd.device_id=tdd.device_id left join tb_device_value tdv on tdd.id=tdv.attribute_id left join tb_pro_bd tpb on tpb.id=tbd.bd_id - WHERE tpb.bid_code = #{bidCode} + WHERE tpb.bid_code = #{bidCode} and tbd.del_flag=0 and tbd.devic_type = 1906 AND tbd.device_id=#{deviceId} @@ -85,7 +85,7 @@ left join tb_his_device_value tdv on tdd.id=tdv.attribute_id left join tb_pro_bd tpb on tpb.id=tbd.bd_id WHERE - tbd.devic_type = 1906 and tdv.val is not null and tpb.bid_code = #{bidCode} + tbd.devic_type = 1906 and tdv.val is not null and tpb.bid_code = #{bidCode} and tbd.del_flag=0 AND tbd.device_name like concat('%',#{deviceName},'%')