From fba94c10a0003d9df6eda30f8011f3d16653e750 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 23 May 2022 16:52:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcResiUserDao.xml                  | 1 +
 1 file changed, 1 insertion(+)

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 7057ade746..6e7ea6f69b 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
@@ -294,6 +294,7 @@
             IFNULL(REMARKS,'') AS REMARKS
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
             <if test="level != null and level != ''">
                 <if test="level=='agency'">
                     AND (AGENCY_ID = #{id} OR PIDS LIKE CONCAT('%',#{id},'%'))

From 3a7076d10ea9908be1cbba981e51645b85e62992 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 23 May 2022 16:53:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java              | 2 +-
 .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +-
 2 files changed, 2 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 ab73f7826a..23e59d3f13 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
@@ -133,7 +133,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                              @Param("level")String level,
                                              @Param("id")String id,
                                              @Param("agencyId") String agencyId,
-                                             @Param("pageNo") Integer pageNo);
+                                             @Param("pageNo") Integer pageNo,@Param("customerId") String customerId);
 
     Set<String> selectUserDemandCode(String icResiUserId);
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index bc6582d1e0..6a14cc8ad9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -920,7 +920,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 formDTO.getLevel(),
                 formDTO.getId(),
                 staffInfo.getAgencyId(),
-                no));
+                no,formDTO.getCustomerId()));
         List<SearchByNameResultDTO> result = pageInfo.getList();
         if (CollectionUtils.isEmpty(result)) {
             return new PageData<>(new ArrayList<>(), pageInfo.getTotal());