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;