From b700563fde0ad1a19696d82be03fa8f94340728f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 5 Jul 2022 15:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/PublishGridListFormDTO.java  | 4 ++++
 .../java/com/epmet/controller/ArticleController.java     | 1 +
 .../java/com/epmet/service/impl/ArticleServiceImpl.java  | 9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
index a9ad61ecc6..3b35533d99 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java
@@ -25,4 +25,8 @@ public class PublishGridListFormDTO implements Serializable {
      * token中人员Id
      */
     private String staffId;
+    /**
+     * token中客户ID
+     */
+    private String customerId;
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
index e08c8dca5f..56b92b7d5c 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
@@ -351,6 +351,7 @@ public class ArticleController {
 	 **/
 	@PostMapping("publishgridlist")
 	public Result<ArticleAgencyGridListResultDTO> publishGridList(@LoginUser TokenDto tokenDTO, @RequestBody PublishGridListFormDTO formDTO) {
+		formDTO.setCustomerId(tokenDTO.getCustomerId());
 		formDTO.setStaffId(tokenDTO.getUserId());
 		ValidatorUtils.validateEntity(formDTO, PublishGridListFormDTO.AddUserInternalGroup.class);
 		ArticleAgencyGridListResultDTO agencyGridList = new ArticleAgencyGridListResultDTO();
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 2c2ea58bfc..0661ece50b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -736,12 +736,17 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			return new ArticleGridResultDTO();
 		}
 		//2:查询当前工作人员的所属组织，以此作为根节点的起始位置
-		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
+		/*LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
 		loginUserDetailsFormDTO.setApp("gov");
 		loginUserDetailsFormDTO.setClient("wxmp");
 		loginUserDetailsFormDTO.setUserId(formDTO.getStaffId());
 		Result<LoginUserDetailsResultDTO> resultDTOResult = epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO);
-		String agencyId = resultDTOResult.getData().getOrgIdPath().substring(resultDTOResult.getData().getOrgIdPath().lastIndexOf(":") + NumConstant.ONE);
+		String agencyId = resultDTOResult.getData().getOrgIdPath().substring(resultDTOResult.getData().getOrgIdPath().lastIndexOf(":") + NumConstant.ONE);*/
+		CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+		if (null == staffInfo) {
+			throw new EpmetException("获取工作人员信息失败");
+		}
+		String agencyId = staffInfo.getAgencyId();
 		//存放树的每一个节点对象，用于将同一节点下的网格列表合并（主键：agencyId 值：节点对象）
 		Map<String, ArticleGridResultDTO> map = new HashMap<>();
 		//3:循环可下线网格列表，根据pids组织每一个树节点对象信息