From 23b7e5f8c70e53d920c0577353ccfde5970ac183 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 25 九月 2023 12:42:55 +0800
Subject: [PATCH] update springboot 3.1.3 =. 3.1.4 update springboot-admin 3.1.5 => 3.1.6 update satoken 1.35.0.RC => 1.36.0 update hutool 5.8.20 => 5.8.22 update lombok 1.18.26 => 1.18.30
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 875352b..b191698 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.SysRole" id="SysRoleResult">
+ <resultMap type="org.dromara.system.domain.vo.SysRoleVo" id="SysRoleResult">
</resultMap>
<sql id="selectRoleVo">
@@ -49,8 +49,19 @@
</select>
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
+ select r.role_id,
+ r.role_name,
+ r.role_key,
+ r.role_sort
+ 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 r.del_flag = '0' and u.user_name = #{userName}
</select>
+ <select id="selectRoleById" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ WHERE r.del_flag = '0' and r.role_id = #{roleId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3