From ef33492fa817c1a61589a25cc5a2721663f49e8c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 06 一月 2025 11:37:23 +0800
Subject: [PATCH] 添加了两个字段,已经修改了对应代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index be97a3d..6a4b3f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -96,6 +96,24 @@
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+    @GetMapping("/listCommonUser")
+    public TableDataInfo listCommonUser(SysUser user)
+    {
+        startPage();
+    //    System.out.println(user.getClanId());
+        System.out.println("----------------++++++++++++==0------------");
+        List<SysUser> list = userService.selectCommonUserList(user);
+        return getDataTable(list);
+    }
+    @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PostMapping("/exportCommonUser")
+    public void exportCommonUser(HttpServletResponse response, SysUser user)
+    {
+        List<SysUser> list = userService.selectCommonUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
+    }
 
     @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
@@ -144,7 +162,7 @@
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+//            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
         return ajax;
     }

--
Gitblit v1.9.1