代码回退

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 # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.81</version>
+    <version>0.3.82</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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<CustomerAgencyDao
         agencyList.setAgencyName(entity.getOrganizationName());
         processorList.setAgencyList(agencyList);
         //2:查询当前组织的上两级组织，按层级排序
-        String[] args = new String[]{};
+        String pids = entity.getPids();
-        if (StringUtils.isNotBlank(entity.getPids())) {
+        String[] args = pids.split(":");
-            String pids = entity.getPids();
-            args = pids.split(":");
-        }
         List<String> agencyIdList = new ArrayList<>();
         if (args.length < NumConstant.ONE) {
             processorList.setParentAgencyList(parentAgencyList);
@@ -597,7 +594,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 agencyIdList.add(args[args.length - NumConstant.ONE]);
             }
             List<CustomerAgencyDTO> 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<CustomerAgencyDao
             processorList.setParentAgencyList(parentAgencyList);
         }
         //3:迭代查询当前组织的所有下级组织列表
-        List<AgencySubResultDTO> subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : ":") + entity.getId());
+        List<AgencySubResultDTO> subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId());
         processorList.setSubAgencyList(subAgencyList);
 
         return processorList;