From 94ae833b8232f1278a05173116e454f2d1f18d30 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 27 Sep 2022 14:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=A0=E9=99=A4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E4=B8=8B=E7=BA=A7=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/activity/mapper/XhpcWorkDeptMapper.java  |  2 ++
 .../activity/service/impl/WorkDeptServiceImpl.java    | 11 ++++++++---
 .../src/main/resources/mapper/XhpcWorkDeptMapper.xml  | 10 +++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
index 76db4778..58187720 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
@@ -23,4 +23,6 @@ public interface XhpcWorkDeptMapper {
     int updateByPrimaryKey(XhpcWorkDeptDomain record);
 
     int updateStatusByPrimaryKey(XhpcWorkDeptDomain record);
+
+    List<XhpcWorkDeptDomain> selectListByParentDeptId(@Param("parentDeptId") Long parentDeptId);
 }
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java
index d85eb9c9..af9f2611 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java
@@ -34,7 +34,7 @@ public class WorkDeptServiceImpl implements WorkDeptService {
     public List<Map<String, Object>> getList(Map<String, Object> params){
         List<Map<String, Object>> deptList = deptMapper.selectMapListByParams(params);
         for (Map<String, Object> dept: deptList){
-            params.put("parentDeptId", dept.get("id"));
+            params.put("parentDeptId", dept.get("id").toString().replaceAll("d_", ""));
             List<Map<String,Object>> childDeptList = deptMapper.selectMapListByParams(params);
             dept.put("children", childDeptList);
         }
@@ -45,13 +45,13 @@ public class WorkDeptServiceImpl implements WorkDeptService {
     public List<Map<String, Object>> getTree(Map<String, Object> params){
         List<Map<String, Object>> deptList = deptMapper.selectMapListByParams(params);
         for (Map<String, Object> dept: deptList){
-            params.put("parentDeptId", dept.get("id"));
+            params.put("parentDeptId", dept.get("id").toString().replaceAll("d_", ""));
             List<Map<String,Object>> childDeptList = deptMapper.selectMapListByParams(params);
             if(childDeptList.size() > 0){
                 dept.put("children", childDeptList);
             }
             for (Map<String, Object> childMap: childDeptList){
-                params.put("parentDeptId", childMap.get("id"));
+                params.put("parentDeptId", childMap.get("id").toString().replaceAll("d_", ""));
                 List<Map<String,Object>> childDeptList1 = deptMapper.selectMapListByParams(params);
                 if(childDeptList1.size() > 0){
                     childMap.put("children", childDeptList1);
@@ -97,6 +97,11 @@ public class WorkDeptServiceImpl implements WorkDeptService {
 
     @Override
     public Boolean deleteDomain(Long deptId){
+        List<XhpcWorkDeptDomain> domainList = deptMapper.selectListByParentDeptId(deptId);
+        if (domainList.size() > 0){
+            throw new CustomException("存在下级部门");
+        }
+
         return deptMapper.deleteLogicByPrimaryKey(deptId) > 0;
     }
 }
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
index 27eabad4..e58ed9d5 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
@@ -100,7 +100,15 @@
     </select>
 
 
-    <update id="deleteLogicByPrimaryKey" parameterType="java.lang.Long">
+  <select id="selectListByParentDeptId" resultType="com.xhpc.activity.domain.XhpcWorkDeptDomain">
+    select
+    <include refid="Base_Column_List" />
+    from xhpc_work_dept
+    where del_flag = 0 and parent_dept_id=#{parentDeptId}
+  </select>
+
+
+  <update id="deleteLogicByPrimaryKey" parameterType="java.lang.Long">
     update xhpc_work_dept set del_flag=2
     where work_dept_id = #{workDeptId,jdbcType=BIGINT}
   </update>