From b5c5d329377c63a39c7a3e365aeb8e01e3763d67 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:48:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index b643b6a136..4669299d44 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.81 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.82 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d431df354c..64cfad94f0 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.81 + 0.3.82 com.epmet gov-org diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 9e059be1bc..69a1d4ec87 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,11 +581,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -597,7 +594,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent -> { + parentList.forEach(parent->{ AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -606,7 +603,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : ":") + entity.getId()); + List subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList; From 2d6825338ce1a103acc80c737170295a4f405c1f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:53:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E9=A1=B6=E7=BA=A7=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E5=BE=80?= =?UTF-8?q?=E4=B8=8B=E8=BD=ACbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 69a1d4ec87..e399d29b85 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,8 +581,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -594,7 +597,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent->{ + parentList.forEach(parent -> { AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -603,7 +606,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); + List subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : entity.getPids() + ":") + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList; From 98759cd9012a7ca7100bb4931b8428279c4c31fb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:58:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?master=5Fbugfix=E5=88=86=E6=94=AF=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=88=B0dev=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 4669299d44..c8e1e6f1eb 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.82 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.83 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 64cfad94f0..bff2680d39 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.82 + 0.3.83 com.epmet gov-org