!86 修复修改部门层级BUG

Merge pull request !86 from EasyProgramming/fix

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -98,4 +98,11 @@ public interface SysDeptMapper
      * @param dept 部门
      */
     public void updateDeptStatus(SysDept dept);
+
+    /**
+     * 根据ID查询所有子部门
+     * @param id
+     * @return
+     */
+    public List<SysDept> selectChildrenDeptById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -185,15 +185,17 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int updateDept(SysDept dept)
     {
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        if (StringUtils.isNotNull(info))
+        SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
+        SysDept oldDept = selectDeptById(dept.getDeptId());
+        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
         {
-            String ancestors = info.getAncestors() + "," + info.getDeptId();
-            dept.setAncestors(ancestors);
-            updateDeptChildren(dept.getDeptId(), ancestors);
+            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+            String oldAncestors = oldDept.getAncestors();
+            dept.setAncestors(newAncestors);
+            updateDeptChildren(dept.getDeptId(), newAncestors,oldAncestors);
         }
         int result = deptMapper.updateDept(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
@@ -219,22 +221,20 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改子元素关系
-     * 
-     * @param deptId 部门ID
-     * @param ancestors 元素列表
+     * @param deptId 被修改的部门ID
+     * @param newAncestors 新的父ID集合
+     * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String ancestors)
+    public void updateDeptChildren(Long deptId, String newAncestors,String oldAncestors)
     {
-        SysDept dept = new SysDept();
-        dept.setParentId(deptId);
-        List<SysDept> childrens = deptMapper.selectDeptList(dept);
-        for (SysDept children : childrens)
+        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+        for (SysDept child : children)
         {
-            children.setAncestors(ancestors + "," + dept.getParentId());
+            child.setAncestors(child.getAncestors().replace(oldAncestors,newAncestors));
         }
-        if (childrens.size() > 0)
+        if (children.size() > 0)
         {
-            deptMapper.updateDeptChildren(childrens);
+            deptMapper.updateDeptChildren(children);
         }
     }
 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -74,6 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>
+
+	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
+		select * from sys_dept
+		<where>
+			FIND_IN_SET(#{id},ancestors)
+		</where>
+	</select>
 	
 	<insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(