Merge remote-tracking branch 'origin/dev_voice' into dev_voice

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -195,7 +195,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity.setCustomerId(tokenDto.getCustomerId());
 			draftEntity.setIsTop(DraftConstant.UN_TOP);
 			draftEntity.setStatusFlag(DraftConstant.UNPUBLISH);
-			draftEntity.setOrgId(loginUserDetails.getData().getAgencyId());
+			String orgIdPath = loginUserDetails.getData().getOrgIdPath();
+			String agencyId = orgIdPath.split(":")[orgIdPath.split(":").length - 1];
+			draftEntity.setOrgId(agencyId);
 			draftEntity.setOrgIdPath(loginUserDetails.getData().getOrgIdPath());
 			draftEntity.setGridId("");
 			draftEntity.setDepartmentId(loginUserDetails.getData().getCustomerId());
@@ -669,7 +671,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		loginUserDetailsFormDTO.setClient("wxmp");
 		loginUserDetailsFormDTO.setUserId(formDTO.getStaffId());
 		Result<LoginUserDetailsResultDTO> resultDTOResult = epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO);
-		String agencyId = resultDTOResult.getData().getOrgIdPath();
+		String agencyId = resultDTOResult.getData().getOrgIdPath().substring(resultDTOResult.getData().getOrgIdPath().lastIndexOf(":")+NumConstant.ONE);
 		//存放树的每一个节点对象，用于将同一节点下的网格列表合并（主键：agencyId 值：节点对象）
 		Map<String, ArticleGridResultDTO> map = new HashMap<>();
 		//3:循环可下线网格列表，根据pids组织每一个树节点对象信息