From 997d1c5bc05dfa79ad4d0368ef9f55a11a8dfae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 24 Sep 2018 12:12:23 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82=E9=83=A8=E9=97=A8=E5=85=B3=E7=B3=BB=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=EF=BC=88jdbcurl=20allowMultiQueries=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pig/admin/mapper/SysDeptMapper.java       |  6 ---
 .../admin/mapper/SysDeptRelationMapper.java   | 12 ++++++
 .../service/impl/SysDeptServiceImpl.java      | 11 +++---
 .../main/resources/mapper/SysDeptMapper.xml   | 19 ----------
 .../mapper/SysDeptRelationMapper.xml          | 37 +++++++++++++++++++
 5 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptMapper.java
index 1491b33b..03c74d3b 100644
--- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptMapper.java
+++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptMapper.java
@@ -39,10 +39,4 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      * @return 数据列表
      */
     List<SysDept> selectDeptDtoList(String delFlag);
-
-    /**
-     * 删除部门关系表数据
-     * @param id 部门ID
-     */
-    void deleteDeptRealtion(Integer id);
 }
\ No newline at end of file
diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptRelationMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptRelationMapper.java
index 1750b227..10c79daf 100644
--- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptRelationMapper.java
+++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDeptRelationMapper.java
@@ -29,5 +29,17 @@ import com.github.pig.admin.model.entity.SysDeptRelation;
  * @since 2018-02-12
  */
 public interface SysDeptRelationMapper extends BaseMapper<SysDeptRelation> {
+    /**
+     * 删除部门关系表数据
+     *
+     * @param id 部门ID
+     */
+    void deleteAllDeptRealtion(Integer id);
 
+    /**
+     * 更改部分关系表数据
+     *
+     * @param deptRelation
+     */
+    void updateDeptRealtion(SysDeptRelation deptRelation);
 }
\ No newline at end of file
diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDeptServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDeptServiceImpl.java
index b8ed9929..abe8672d 100644
--- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDeptServiceImpl.java
+++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDeptServiceImpl.java
@@ -98,7 +98,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         sysDept.setUpdateTime(new Date());
         sysDept.setDelFlag(CommonConstant.STATUS_DEL);
         this.deleteById(sysDept);
-        sysDeptMapper.deleteDeptRealtion(id);
+        sysDeptRelationMapper.deleteAllDeptRealtion(id);
         return Boolean.TRUE;
     }
 
@@ -112,10 +112,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public Boolean updateDeptById(SysDept sysDept) {
         //更新部门状态
         this.updateById(sysDept);
-        //删除部门关系
-        sysDeptMapper.deleteDeptRealtion(sysDept.getDeptId());
-        //新建部门关系
-        this.insertDeptRelation(sysDept);
+        //更新部门关系
+        SysDeptRelation relation = new SysDeptRelation();
+        relation.setAncestor(sysDept.getParentId());
+        relation.setDescendant(sysDept.getDeptId());
+        sysDeptRelationMapper.updateDeptRealtion(relation);
         return null;
     }
 
diff --git a/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptMapper.xml
index 196c91c4..80d01c78 100644
--- a/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptMapper.xml
+++ b/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptMapper.xml
@@ -33,25 +33,6 @@
     <sql id="Base_Column_List">
         dept_id AS deptId, parent_id AS parentId, name, order_num AS orderNum, create_time AS createTime, update_time AS updateTime, del_flag AS delFlag
     </sql>
-    <delete id="deleteDeptRealtion">
-        DELETE
-        FROM
-            sys_dept_relation
-        WHERE
-            descendant IN (
-                SELECT
-                    temp.descendant
-                FROM
-                    (
-                        SELECT
-                            descendant
-                        FROM
-                            sys_dept_relation
-                        WHERE
-                            ancestor = #{id}
-                    ) temp
-            )
-    </delete>
 
     <!--关联查询部门列表-->
     <select id="selectDeptDtoList" resultType="com.github.pig.admin.model.entity.SysDept">
diff --git a/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptRelationMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptRelationMapper.xml
index 0ac05835..2f8a6e5e 100644
--- a/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptRelationMapper.xml
+++ b/pig-modules/pig-upms-service/src/main/resources/mapper/SysDeptRelationMapper.xml
@@ -30,4 +30,41 @@
         ancestor, descendant
     </sql>
 
+	<!-- 更新部门关系 -->
+	<update id="updateDeptRealtion">
+        DELETE FROM sys_dept_relation
+        WHERE
+        	descendant IN ( SELECT temp.descendant FROM
+        	( SELECT descendant FROM sys_dept_relation WHERE ancestor = #{descendant} ) temp )
+        AND ancestor IN ( SELECT temp.ancestor FROM ( SELECT ancestor FROM
+        	sys_dept_relation WHERE descendant = #{descendant} AND ancestor != descendant ) temp );
+
+		INSERT INTO sys_dept_relation (ancestor, descendant)
+		SELECT a.ancestor, b.descendant
+		FROM sys_dept_relation a
+			CROSS JOIN sys_dept_relation b
+		WHERE a.descendant = #{ancestor}
+			AND b.ancestor = #{descendant};
+	</update>
+
+	<!--删除部门-->
+	<delete id="deleteAllDeptRealtion">
+        DELETE
+        FROM
+            sys_dept_relation
+        WHERE
+            descendant IN (
+                SELECT
+                    temp.descendant
+                FROM
+                    (
+                        SELECT
+                            descendant
+                        FROM
+                            sys_dept_relation
+                        WHERE
+                            ancestor = #{id}
+                    ) temp
+            )
+    </delete>
 </mapper>