From 0eabfcfc0814554ca86c80a0c907aaafd004534f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 5 Mar 2021 13:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/entity/SysDeptEntity.java    | 4 ++++
 .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java  | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
index 32aef2b..90c01cf 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
@@ -50,6 +50,10 @@ public class SysDeptEntity extends BaseEntity {
      * 区域编码
      */
     private String allAreaCode;
+    /**
+     * 区域编码
+     */
+    private String parentAreaCode;
     /**
      * 排序
      */
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 7314ec0..4529f0f 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
@@ -134,7 +134,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             }
         }
         SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class);
-
+        if (!entity.getAllAreaCode().isEmpty()) {
+            entity.setParentAreaCode(entity.getAllAreaCode().substring(0, entity.getAllAreaCode().lastIndexOf(",")));
+        }
         entity.setPids(getPidList(entity.getPid()));
         insert(entity);
 
@@ -161,7 +163,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         if (entity.getId().equals(entity.getPid())) {
             throw new RenException(ErrorCode.SUPERIOR_DEPT_ERROR);
         }
-
+        if (!entity.getAllAreaCode().isEmpty()) {
+            entity.setParentAreaCode(entity.getAllAreaCode().substring(0, entity.getAllAreaCode().lastIndexOf(",")));
+        }
         entity.setPids(getPidList(entity.getPid()));
 
         // 发送消息