From b528f0bd146769407de4b7da223e75d46b51d345 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 13:06:31 +0800
Subject: [PATCH] 🧨🧨🧨发布 5.3.0 新春版 祝大家新年快乐

---
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 ba2eca9..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
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
+<mapper namespace="org.dromara.system.mapper.SysRoleMapper">
 
-    <resultMap type="com.ruoyi.system.domain.vo.SysRoleVo" id="SysRoleResult">
+    <resultMap type="org.dromara.system.domain.vo.SysRoleVo" id="SysRoleResult">
     </resultMap>
 
     <sql id="selectRoleVo">
@@ -40,17 +40,20 @@
         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}
+        WHERE r.del_flag = '0' and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
     </select>
 
-    <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
+    <select id="selectRoleById" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        WHERE r.del_flag = '0' and u.user_name = #{userName}
+        WHERE r.del_flag = '0' and r.role_id = #{roleId}
     </select>
 
 </mapper>

--
Gitblit v1.9.3