From e22a91be4e71cf0cdcefe30593bcdc967682b680 Mon Sep 17 00:00:00 2001
From: Kang_Yang <591616450@qq.com>
Date: Thu, 17 Oct 2024 10:56:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5=E7=BB=84=E4=BB=B6=E4=B8=8B=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AD=9B=E9=80=89=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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..6604f657 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..a9a7feef 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -47,6 +47,12 @@
                     AND u.create_time &lt;= #{endDate}
                 </if>
             </if>
+            <if test="queryParams.roleIds != null and queryParams.roleIds.size() > 0">
+                AND sur.role_id IN
+                <foreach item="roleId" collection="queryParams.roleIds" open="(" separator="," close=")">
+                    #{roleId}
+                </foreach>
+            </if>
         </where>
         GROUP BY
             u.id