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;