From 5761ba4271200a3baf2333d265175586d87c554d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 11:02:44 +0800
Subject: [PATCH] update druid 1.2.11 => 1.2.12 update hutool 5.8.5 => 5.8.6 update dynamic-ds 3.5.1 => 3.5.2 update aws-java-sdk-s3 1.12.264 => 1.12.300 update aliyun-sms 2.0.16 => 2.0.18 update tencent-sms 3.1.555 => 3.1.591
---
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 17 ++++++++++-------
1 files changed, 10 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 07fc5d6..00493be 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -22,16 +22,19 @@
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="selectDeptListByRoleId" resultType="Integer">
+ <select id="selectDeptList" resultMap="SysDeptResult">
+ select * from sys_dept ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d
- left join sys_role_dept rd on d.dept_id = rd.dept_id
+ left join sys_role_dept rd on d.dept_id = rd.dept_id
where 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>
+ <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>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3