部门树

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -389,7 +389,7 @@ public class SysUserController extends BaseController
     public AjaxResult deptTreeNow()
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        return success(deptService.selectDeptTreeList(user.getDept()));
+        return success(deptService.selectDeptTreeNowList(user.getDept()));
     }
 
     /***

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

@@ -115,4 +115,6 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    List<SysDept> selectDeptTreeNowList(SysDept dept);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -121,4 +121,6 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    List<TreeSelect> selectDeptTreeNowList(SysDept dept);
 }

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

@@ -293,6 +293,12 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
     }
 
+    @Override
+    public List<TreeSelect> selectDeptTreeNowList(SysDept dept) {
+        List<SysDept> depts = deptMapper.selectDeptTreeNowList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
     /**
      * 递归列表
      */

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

@@ -156,4 +156,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+	<select id="selectDeptTreeNowList" parameterType="SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="deptId != null and deptId != 0">
+			AND (dept_id = #{deptId} or ancestors like concat('%', #{deptId}, '%')
+		</if>
+		<if test="parentId != null and parentId != 0">
+			AND parent_id = #{parentId}
+		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by d.parent_id, d.order_num
+	</select>
+
 </mapper>