From fadea442b85115698ad4eb5d3aa04d916cfbb70d Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 6 Dec 2023 17:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=A1=97=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

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 fc656b98ec..15db43ad32 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
@@ -3290,7 +3290,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         List<IcUserScreenResultDTO> result = new ArrayList<>();
 
-        if (level.equals("street")){
+        if (level.equals("city")){
+            List<CustomerChildAgencyResultDTO> streetList = govOrgOpenFeignClient.getChildAgencyList(agencyId).getData();
+            streetList.forEach(
+                    street -> {
+                        IcUserScreenResultDTO dto = new IcUserScreenResultDTO();
+                        LambdaQueryWrapper<IcResiUserEntity> userEntityLambdaQueryWrapper
+                                = new LambdaQueryWrapper<IcResiUserEntity>().likeRight(IcResiUserEntity::getPids, street.getPids()+":"+street.getId());
+                        List<IcResiUserEntity> userEntities = baseDao.selectList(userEntityLambdaQueryWrapper);
+                        dto.setAgencyName(street.getOrganizationName());
+                        dto.setAgencyId(street.getId());
+                        dto.setCount(userEntities.size());
+                        result.add(dto);
+                    });
+        }
+        else if (level.equals("street")){
             List<CustomerChildAgencyResultDTO> communityList = govOrgOpenFeignClient.getChildAgencyList(agencyId).getData();
             communityList.forEach(
                     community -> {
@@ -3329,7 +3343,23 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
         PageInfo<IcUserScreenListResultDTO> pageData = new PageInfo<>();
 
-        if (dto.getLevel().equals("community")){
+        if (dto.getLevel().equals("street")){
+
+            CustomerAgencyDTO customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(dto.getAgencyId()).getData();
+
+            LambdaQueryWrapper<IcResiUserEntity> userEntityLambdaQueryWrapper
+                    = new LambdaQueryWrapper<IcResiUserEntity>().likeRight(IcResiUserEntity::getPids, customerAgencyDTO.getPids()+":"+customerAgencyDTO.getId());
+
+            PageHelper.startPage(dto.getPageNo(),dto.getPageSize());
+
+            List<IcResiUserEntity> userEntities = baseDao.selectList(userEntityLambdaQueryWrapper);
+
+            PageInfo<IcResiUserEntity> pageInfo = new PageInfo<>(userEntities);
+            pageData.setTotal(pageInfo.getTotal());
+
+            list = ConvertUtils.sourceToTarget(userEntities,IcUserScreenListResultDTO.class);
+        }
+        else if (dto.getLevel().equals("community")){
 
             LambdaQueryWrapper<IcResiUserEntity> userEntityLambdaQueryWrapper
                     = new LambdaQueryWrapper<IcResiUserEntity>().eq(IcResiUserEntity::getAgencyId, dto.getAgencyId());