From c3b5cb20d847f24cd7c2545c65ab01c88767aaf3 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期三, 10 六月 2020 22:04:51 +0800 Subject: [PATCH] !25 Live轻量级PR Merge pull request !25 from Live/live --- ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml index 247bb69..3338046 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml @@ -40,7 +40,7 @@ AND status = #{status} </if> <!-- 数据范围过滤 --> - ${dataScope} + ${params.dataScope} order by d.parent_id, d.order_num </select> @@ -71,6 +71,10 @@ select * from sys_dept where find_in_set(#{deptId}, ancestors) </select> + <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int"> + select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors) + </select> + <select id="checkDeptNameUnique" resultMap="SysDeptResult"> <include refid="selectDeptVo"/> where dept_name=#{deptName} and parent_id = #{parentId} -- Gitblit v1.9.2