From 1658216f7116dc03e609597634ea2a3752bb355e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 25 Mar 2025 14:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/domain/SysUser.java   | 13 +++++++++++++
 .../main/resources/mapper/system/SysUserMapper.xml  |  7 ++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
index def1c70..580c3de 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
@@ -137,6 +137,11 @@ public class SysUser extends BaseEntity {
      */
     private Long[] roleIds;
 
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
     /**
      * 岗位组
      */
@@ -350,6 +355,14 @@ public class SysUser extends BaseEntity {
         this.roleIds = roleIds;
     }
 
+    public String getRoleKey() {
+        return roleKey;
+    }
+
+    public void setRoleKey(String roleKey) {
+        this.roleKey = roleKey;
+    }
+
     public Long[] getPostIds() {
         return postIds;
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index e460200..a806acc 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -152,11 +152,8 @@
                 #{item}
             </foreach>
         </if>
-        <if test="roles != null and roles.size() > 0">
-            and r.role_key in
-            <foreach collection="roles" item="item" index="index" separator="," open="(" close=")">
-                #{item.roleKey}
-            </foreach>
+        <if test="roleKey != null and roleKey != ''">
+            and r.role_key like concat('%', #{roleKey}, '%')
         </if>
        <include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
         GROUP BY u.user_id