Merge remote-tracking branch 'origin/dev_policy_service' into dev_policy_service

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -71,7 +71,9 @@
 
     <sql id="segmentForPolicyRules">
         <where>
-            ic_resi_user.CUSTOMER_ID=#{customerId}
+            ic_resi_user.status='0'
+            and ic_resi_user.CUSTOMER_ID=#{customerId}
+            and ic_resi_user.del_flag='0'
             <!--组织过滤-->
             <if test="orgId != null and orgId != '' and orgType != null and orgType != ''">
                 <choose>
@@ -84,23 +86,23 @@
                 </choose>
             </if>
             <!--   小区等条件  -->
-            <if test="neighborHoodId != null">
+            <if test="neighborHoodId != null and neighborHoodId!=''">
                 and ic_resi_user.VILLAGE_ID=#{neighborHoodId}
             </if>
-            <if test="buildingId != null">
+            <if test="buildingId != null and buildingId!=''">
                 and ic_resi_user.BUILD_ID=#{buildingId}
             </if>
-            <if test="unitId != null">
+            <if test="unitId != null and unitId!=''">
                 and ic_resi_user.UNIT_ID=#{unitId}
             </if>
-            <if test="houseId != null">
+            <if test="houseId != null and houseId!=''">
                 and ic_resi_user.HOME_ID=#{houseId}
             </if>
-            <if test="idCard != null">
-                and ic_resi_user.ID_CARD like CONCAT('%'#{idCard}, '%')
+            <if test="idCard != null and idCard!=''">
+                and ic_resi_user.ID_CARD like CONCAT('%',#{idCard}, '%')
             </if>
-            <if test="name != null">
-                and ic_resi_user.NAME like CONCAT('%'#{name}, '%')
+            <if test="name != null  and name!=''">
+                and ic_resi_user.NAME like CONCAT('%',#{name}, '%')
             </if>
             <!--    房屋id列表      -->
             <if test="houseIds != null and houseIds.size() > 0">