From b779cf053df9f75e2edffcad4a01070d9f2a021e Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 02 十一月 2020 17:30:06 +0800
Subject: [PATCH] !112 未选择时，点击“确认”，出现必填验证提示。使用blur的话，选择之后验证消息不会自动消失，使用change会自动消失。 Merge pull request !112 from FlyFive/N/A
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 36c2aa5..cdc26f4 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>
--
Gitblit v1.9.2