From 69407626f21674d8545ab62adde376367001e62f Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Mon, 24 Jan 2022 14:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E6=90=9C=E7=B4=A2(=E5=B1=85=E6=B0=91)=EF=BC=9Aconditi?=
 =?UTF-8?q?ons=E4=B8=BAnull=E7=9A=84bug=202.=E7=A4=BE=E5=8C=BA=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2(=E6=88=BF=E5=B1=8B)=EF=BC=9A=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml     | 2 +-
 .../main/java/com/epmet/controller/IcResiUserController.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 7411fb6575..01e2276fac 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -130,7 +130,7 @@
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
             <if test="pids != null and pids != ''">
-                AND c.AGENCY_PIDS like CONCAT(#{pids},'%')
+                AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%')
             </if>
             <if test="buildingId != null and buildingId.trim() != ''">
                 AND a.BUILDING_ID = #{buildingId}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 9c2113a603..1350ce159f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -660,6 +660,7 @@ public class IcResiUserController {
         input.setCustomerId(loginUser.getCustomerId());
         input.setStaffId(loginUser.getUserId());
         input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
+        input.setConditions(new ArrayList<>());
         if (input.getPageNo() == null) {
             input.setPageNo(NumConstant.ONE);
         }