Merge branch 'dev_move_out_of' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -304,7 +304,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     List<UserChartResultDTO> userChart(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
     /**
-     * desc:根据维度获取居民信息表的数据
+     * desc:根据维度获取居民信息表的数据[正常状态的居民]
      * @param formDTO
      * @return
      */

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -952,7 +952,8 @@
             ID,NAME,GENDER,MOBILE,ID_CARD,BIRTHDAY,HJSZD,YHZGX,IS_PARTY,IS_TENANT,IS_FLOATING,GZDW,MZ,JG,HYZK,CULTURE,FAITH,REMARKS
         FROM  ic_resi_user
         WHERE
-        CUSTOMER_ID = #{customerId}
+            STATUS = '0'
+            AND CUSTOMER_ID = #{customerId}
         <if test="pids != null and pids.trim() != ''">
            and AGENCY_ID = #{agencyId} OR PIDS like CONCAT(#{pids}, '%')
         </if>