From 06c5265351dc9817a368b5316f1df04cc89dfda2 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 24 Jun 2022 14:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/service/impl/CaLoudongServiceImpl.java      | 9 ++++++---
 .../opendata/service/impl/CaResidentServiceImpl.java     | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
index cc7433601a..b00f359e0f 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
@@ -7,10 +7,13 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.OrgLevelEnum;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaLoudongDao;
 import com.epmet.opendata.dto.ca.CaLoudongDTO;
@@ -115,11 +118,11 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerGridDTO>> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId);
+        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        gridIListByAgency.getData().forEach(item -> {
-            gridList.add(item.getId());
+        staffGridList.getData().forEach(item -> {
+            gridList.add(item.getGridId());
         });
 
         PageHelper.startPage(dto.getPage(), dto.getLimit());
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
index 5860ac1a98..26a4ee91e9 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
@@ -9,6 +9,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -16,6 +17,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaResidentDao;
@@ -120,11 +122,11 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerGridDTO>> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId);
+        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        gridIListByAgency.getData().forEach(item -> {
-            gridList.add(item.getId());
+        staffGridList.getData().forEach(item -> {
+            gridList.add(item.getGridId());
         });
 
         // 分页查询