From 631739733f2bbdc4dc78d74c84ed32df0ad12083 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 15 十一月 2024 11:11:42 +0800
Subject: [PATCH] Revert "update 优化 加密拦截器plugin方法按规定返回代理对象"
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index d482f39..4ef7b1e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -40,17 +40,15 @@
WHERE r.del_flag = '0' and sur.user_id = #{userId}
</select>
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
- select r.role_id
+ <select id="selectRolesByUserId" parameterType="Long" resultMap="SysRoleResult">
+ select r.role_id,
+ r.role_name,
+ r.role_key,
+ r.role_sort,
+ r.data_scope,
+ r.status
from sys_role r
- 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>
-
- <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and u.user_name = #{userName}
+ WHERE r.del_flag = '0' and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
</select>
<select id="selectRoleById" resultMap="SysRoleResult">
--
Gitblit v1.9.3