From 265629623386c23b5d300654de32ec76901a67fb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 30 Aug 2021 15:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=A0=B9=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/MineResultDTO.java | 4 ++++ .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java index 69e4ff630d..01b1630ebc 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java @@ -59,4 +59,8 @@ public class MineResultDTO implements Serializable { * 根组织 */ private String rootAgencyId; + /** + * 根组织名 + */ + private String rootAgencyName; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index ceab225169..57e29d2211 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -234,9 +234,13 @@ public class StaffServiceImpl implements StaffService { //获取根组织 CustomerAgencyDTO agency = customerAgencyService.get(customerStaffAgency.getAgencyId()); if (StringUtils.isNotBlank(agency.getPids())) { - result.setRootAgencyId(agency.getPids().split(StrConstant.COLON)[0]); + String rootAgencyId = agency.getPids().split(StrConstant.COLON)[0]; + CustomerAgencyDTO rootAgency = customerAgencyService.get(rootAgencyId); + result.setRootAgencyId(rootAgencyId); + result.setRootAgencyName(rootAgency.getOrganizationName()); } else { result.setRootAgencyId(customerStaffAgency.getAgencyId()); + result.setRootAgencyName(agency.getOrganizationName()); } //2021.08.27 zhaoqf end return result;