From df489baf561e57d8e654469b3d42aca3307b7c72 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 30 Aug 2021 15:06:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java | 2 ++ .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 1 + 2 files changed, 3 insertions(+) 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()); From 265629623386c23b5d300654de32ec76901a67fb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 30 Aug 2021 15:11:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=A0=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BF=A1=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;