diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index d568099084..a03d93fb71 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -15,6 +15,8 @@ import java.util.List; public class StaffDetailV2FormDTO implements Serializable { private static final long serialVersionUID = -1974456701949979946L; + //工作人员所属组织 + private String agencyId = ""; //工作人员用户id private String staffId = ""; //工作人员姓名 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 745e68e804..5a56be39c6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -429,6 +429,7 @@ public class GovOrgServiceImpl implements GovOrgService { } //3.封装数据并返回 + result.setAgencyId(list.get(0).getAgencyId()); result.setOrgId(list.get(0).getOrgId()); result.setOrgName(list.get(0).getOrgName()); result.setOrgType(list.get(0).getOrgType()); 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;