Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'

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

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

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},'%'))