From d0640a69d51df77ec9eebffb24a0fbe9106ab894 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 13 May 2022 15:30:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=88=B7=E4=B8=80=E6=A1=A3=E5=8F=AA?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=AD=A3=E5=B8=B8=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E5=B1=85=E6=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcResiUserDao.java | 2 +- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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}, '%')