diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index b978922d52..41903388f5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -304,7 +304,7 @@ public interface IcResiUserDao extends BaseDao { List userChart(@Param("orgId") String orgId, @Param("orgType") String orgType); /** - * desc:根据维度获取居民信息表的数据 + * desc:根据维度获取居民信息表的数据[正常状态的居民] * @param formDTO * @return */ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2cb6a6fd09..108885918a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/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} and AGENCY_ID = #{agencyId} OR PIDS like CONCAT(#{pids}, '%')