From 7d66a5bd842a9a223106ce36f640d218c89f9555 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: 星期五, 16 九月 2022 09:06:07 +0800
Subject: [PATCH] 升级：升级sa-token到最新版1.31.0
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 9362ebc..90dff50 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -34,21 +34,31 @@
r.create_time,
r.remark
from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
+ left join sys_user_role sur on sur.role_id = r.role_id
+ left join sys_user u on u.user_id = sur.user_id
left join sys_dept d on u.dept_id = d.dept_id
</sql>
- <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+ <select id="selectPageRoleList" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and ur.user_id = #{userId}
+ ${ew.getCustomSqlSegment}
</select>
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+ <select id="selectRoleList" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ WHERE r.del_flag = '0' and sur.user_id = #{userId}
+ </select>
+
+ <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
select r.role_id
from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
+ left join sys_user_role sur on sur.role_id = r.role_id
+ left join sys_user u on u.user_id = sur.user_id
where u.user_id = #{userId}
</select>
@@ -57,4 +67,4 @@
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3