From b9b1ec8f4163bab66cf22bba784bf48b72167e76 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 21 十一月 2021 01:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index fc1214c..94b161b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -42,6 +42,9 @@
<select id="selectPageRoleList" parameterType="SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.del_flag = '0'
+ <if test="role.roleId != null and role.roleId != 0">
+ AND r.role_id = #{role.roleId}
+ </if>
<if test="role.roleName != null and role.roleName != ''">
AND r.role_name like concat('%', #{role.roleName}, '%')
</if>
@@ -97,7 +100,7 @@
WHERE r.del_flag = '0' and ur.user_id = #{userId}
</select>
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
+ <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
--
Gitblit v1.9.3