From ba1a540add437649bae209ba8a8b44f2e2d95451 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: 星期五, 24 五月 2024 13:30:51 +0800
Subject: [PATCH] !542 更新SnailJob版本到1.0.0-beta2 * feat: 配置项变更，避免误解snail-job.group-name => snail-job.group * chore: 更新snail-job版本到1.0.0-beta2
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 b191698..7b8bba7 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,23 +40,17 @@
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 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">
+ <select id="selectRolesByUserId" parameterType="Long" resultMap="SysRoleResult">
select r.role_id,
r.role_name,
r.role_key,
- r.role_sort
+ 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 r.del_flag = '0' and u.user_name = #{userName}
+ WHERE r.del_flag = '0' and sur.user_id = #{userId}
</select>
<select id="selectRoleById" resultMap="SysRoleResult">
--
Gitblit v1.9.3