From 6f222ab02bb4afdc22cbe6ae98c726db6f1f312a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 09:30:38 +0800
Subject: [PATCH] fix 修复 通配符匹配无效

---
 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml |   13 ++++---------
 1 files changed, 4 insertions(+), 9 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..15f94f3 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>
@@ -56,10 +59,6 @@
         </if>
         <if test="role.params.endTime != null and role.params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{role.params.endTime},'%y%m%d')
-        </if>
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        <if test="role.params.dataScope != null and role.params.dataScope != ''">
-            AND ( ${role.params.dataScope} )
         </if>
         order by r.role_sort
     </select>
@@ -85,10 +84,6 @@
         <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
-        <!-- 鏁版嵁鑼冨洿杩囨护 -->
-        <if test="params.dataScope != null and params.dataScope != ''">
-            AND ( ${params.dataScope} )
-        </if>
         order by r.role_sort
     </select>
 
@@ -97,7 +92,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