From 2a604c0548f5b45a00d56298e0c60d09e071e88b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 02 六月 2021 20:40:09 +0800
Subject: [PATCH] !237 同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题 Merge pull request !237 from 老李/origin
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 191f1cc..3845730 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -44,12 +44,14 @@
order by d.parent_id, d.order_num
</select>
- <select id="selectDeptListByRoleId" parameterType="Long" resultType="Integer">
- select d.dept_id, d.parent_id
+ <select id="selectDeptListByRoleId" resultType="Integer">
+ select d.dept_id
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId}
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+ <if test="deptCheckStrictly">
+ and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+ </if>
order by d.parent_id, d.order_num
</select>
@@ -64,7 +66,7 @@
<select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId}
+ where del_flag = '0' and parent_id = #{deptId} limit 1
</select>
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
@@ -77,8 +79,7 @@
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId}
- limit 1
+ where dept_name=#{deptName} and parent_id = #{parentId} limit 1
</select>
<insert id="insertDept" parameterType="SysDept">
@@ -146,7 +147,7 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = sysdate()
</set>
- where dept_id in (${ancestors})
+ where find_in_set(#{deptId}, ancestors)
</update>
<delete id="deleteDeptById" parameterType="Long">
--
Gitblit v1.9.2