From 484715ba72d39a28e5efc6b9a3feb70b3a0d0af2 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Fri, 23 Jul 2021 15:40:14 +0800
Subject: [PATCH] update

---
 .../epdc/service/impl/SysDeptServiceImpl.java | 30 ++++++++++++-------
 epdc-cloud-client-yushan                      |  2 +-
 epdc-cloud-commons-yushan                     |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 08d59e1..a58f161 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -140,8 +140,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             throw new RenException("您输入的编码已存在");
         }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
-        if (!entity.getAllAreaCode().isEmpty()) {
-            String[] areaCodeArray = entity.getAllAreaCode().split(StrConstant.COMMA);
+        if (null == entity) {
+            throw new RenException("新增机构失败");
+        }
+        String allAreaCode = entity.getAllAreaCode();
+        if (StringUtils.isNotBlank(allAreaCode)) {
+            String[] areaCodeArray = allAreaCode.split(StrConstant.COMMA);
             entity.setParentAreaCode(areaCodeArray[areaCodeArray.length - 2]);
         }
         entity.setPids(getPidList(entity.getPid()));
@@ -163,13 +167,17 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             throw new RenException("您输入的编码已存在");
         }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
+        if (null == entity) {
+            throw new RenException("修改机构失败");
+        }
 
         //上级部门不能为自身
         if (entity.getId().equals(entity.getPid())) {
             throw new RenException(ErrorCode.SUPERIOR_DEPT_ERROR);
         }
-        if (!entity.getAllAreaCode().isEmpty()) {
-            String[] areaCodeArray = entity.getAllAreaCode().split(StrConstant.COMMA);
+        String allAreaCode = entity.getAllAreaCode();
+        if (StringUtils.isNotBlank(allAreaCode)) {
+            String[] areaCodeArray = allAreaCode.split(StrConstant.COMMA);
             entity.setParentAreaCode(areaCodeArray[areaCodeArray.length - 2]);
         }
         entity.setPids(getPidList(entity.getPid()));
@@ -397,11 +405,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 for (String id : pids) {
                     SysDeptEntity deptEntity = baseDao.getById(Long.valueOf(id));
                     parentNames += deptEntity.getName() + "-";
-                    if (("street_party").equals(deptEntity.getTypeKey())) {
+                    if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(deptEntity.getTypeKey())) {
                         street = deptEntity.getName();
-                    } else if (("community_party").equals(deptEntity.getTypeKey())) {
+                    } else if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(deptEntity.getTypeKey())) {
                         community = deptEntity.getName();
-                    } else if (("grid_party").equals(deptEntity.getTypeKey())) {
+                    } else if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(deptEntity.getTypeKey())) {
                         grid = deptEntity.getName();
                     }
                 }
@@ -920,12 +928,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             obj = redisUtils.get(deptKey);
         }
         //防止列表为空时 redis一直不更新
-        DeptCodeOption deptCodeOption = (DeptCodeOption)obj;
-        if(deptCodeOption.getOptions().size()==0){
+        DeptCodeOption deptCodeOption = (DeptCodeOption) obj;
+        if (deptCodeOption.getOptions().size() == 0) {
             this.packageKcDeptCodeOption();
             obj = redisUtils.get(deptKey);
         }
-        return new Result<DeptCodeOption>().ok((DeptCodeOption)obj);
+        return new Result<DeptCodeOption>().ok((DeptCodeOption) obj);
     }
 
     @Override
@@ -934,7 +942,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         deptCodeFormDTO.setRootAreaCode(EpmetConstant.DEPT_CODE_YS);
         deptCodeFormDTO.setRootAreaLevel(EpmetConstant.DEPT_CODE_LEVEL_YS);
         Result<DeptCodeOption> deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO);
-        if(deptCodeResult.getData()!=null){
+        if (deptCodeResult.getData() != null) {
             DeptCodeOption deptCodeOption = deptCodeResult.getData();
             redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption);
         }
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index acc2f7b..5f37956 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit acc2f7b6befe41e277de108d7a34b34d8b865371
+Subproject commit 5f3795652ce1dddd3bfced7410ffb36036ed5bbf
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 6df155e..ffc7323 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 6df155e032d4e8fb218da25f1584f0202ea90547
+Subproject commit ffc7323ae85c274afed21d90e2cd744c2801a1a8