From 9582369a830a962a814b246c527dcef3ae264046 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 30 十一月 2024 16:03:25 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 52534e6..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')")

--
Gitblit v1.9.1