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);
         }