|
@@ -521,7 +521,7 @@
|
|
|
<if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.meter_no LIKE concat('%',#{deviceNo},'%') or sd.file_no LIKE concat('%',#{deviceNo},'%'))</if>
|
|
|
<if test="clientName != null and clientName != ''"> AND sgm.customer_name LIKE concat('%',#{clientName},'%')</if>
|
|
|
<if test="locDesc != null and locDesc != ''"> AND sd.loc_desc LIKE concat('%',#{locDesc},'%')</if>
|
|
|
- <if test="status != null and status != ''"> and sd.device_status = #{status}</if>
|
|
|
+ <if test="status != null"> and sd.device_status = #{status}</if>
|
|
|
<if test="valveStatus != null"> and sd.valve_status = #{valveStatus}</if>
|
|
|
<if test="communityIds != null and communityIds.size() != 0">
|
|
|
and sd.community_id in <foreach collection="communityIds" item="item" open="(" separator="," close=")">#{item}</foreach>
|
|
@@ -564,7 +564,7 @@
|
|
|
<if test="deviceNo != null and deviceNo != ''"> AND (sd.device_no LIKE concat('%',#{deviceNo},'%') or sd.meter_no LIKE concat('%',#{deviceNo},'%') or sd.file_no LIKE concat('%',#{deviceNo},'%'))</if>
|
|
|
<if test="clientName != null and clientName != ''"> AND sgm.customer_name LIKE concat('%',#{clientName},'%')</if>
|
|
|
<if test="locDesc != null and locDesc != ''"> AND sd.loc_desc LIKE concat('%',#{locDesc},'%')</if>
|
|
|
- <if test="status != null and status != ''"> and sd.device_status = #{status}</if>
|
|
|
+ <if test="status != null"> and sd.device_status = #{status}</if>
|
|
|
<if test="valveStatus != null"> and sd.valve_status = #{valveStatus}</if>
|
|
|
<if test="communityIds != null and communityIds.size() != 0">
|
|
|
and sd.community_id in <foreach collection="communityIds" item="item" open="(" separator="," close=")">#{item}</foreach>
|