From c5759b75febf16044737690844e50c894845b5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Tue, 15 Oct 2024 13:36:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=A7=92=E8=89=B2=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增删改查组件角色筛选功能bug修复
---
 .../com/youlai/boot/system/model/query/UserPageQuery.java   | 3 +++
 src/main/resources/mapper/system/UserMapper.xml             | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
index 3e2e7f74..9b6959ed 100644
--- a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
@@ -27,6 +27,9 @@ public class UserPageQuery extends BasePageQuery {
     @Schema(description="部门ID")
     private Long deptId;
 
+    @Schema(description="角色ID")
+    private List<Long> roleIds;
+
     @Schema(description="创建时间范围")
     private List<String> createTime;
 
diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index 988b7f07..11937203 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -37,6 +37,12 @@
             <if test='queryParams.deptId!=null'>
                 AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
             </if>
+            <if test='queryParams.roleIds!=null and queryParams.roleIds.size > 0'>
+                AND sur.role_id in
+                <foreach collection="queryParams.roleIds" item="roleId" open="(" close=")" separator=",">
+                    #{roleId}
+                </foreach>
+            </if>
             <if test="queryParams.createTime != null and queryParams.createTime.size > 0">
                 <if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''">
                     <bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>