From 8fa55acb45ca89bfb1165436148d6e1871b51ef9 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 15 Apr 2025 15:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEroleKey=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java     | 16 ++++++++++++++++
 .../resources/mapper/system/SysUserMapper.xml    |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
index 21c1b09..c76c7d0 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
@@ -92,6 +92,22 @@ public class SysUserController extends BaseController {
         return getDataTableError(new ArrayList<>());
     }
 
+    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("system:user:list"))
+    @PostMapping("/listByPost")
+    @SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")
+    public TableDataInfo listByPost(@RequestBody SysUser user) {
+        try {
+            if (user.isPagination()) {
+                startPage();
+            }
+            List<SysUser> list = userService.selectUserList(user);
+            return getDataTable(list);
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+        }
+        return getDataTableError(new ArrayList<>());
+    }
+
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
     @SysLog(title = "用户管理", businessType = OperaType.EXPORT, logType = 0, module = "系统管理->用户管理", details = "导出用户信息")
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 8519c4e..0a1a2a3 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
@@ -144,6 +144,12 @@
                 #{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>
         <if test="userIds != null and userIds.length > 0">
             and u.user_id in
             <foreach collection="userIds" item="item" index="index" separator="," open="(" close=")">