From eed62f6123e98ddfcbd2b42e153d87b49ccf6a37 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 14:25:51 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
index 8a11520..8bc36f2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
@@ -39,7 +39,11 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
-        return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time"))));
+        PageParam<User, BaseParam> page = userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time")));
+        for (User record : page.getRecords()) {
+            record.setRoles(userRoleService.listByUserId(record.getId()));
+        }
+        return R.ok().add(page);
     }
 
     @PreAuthorize("hasAuthority('system:user:list')")

--
Gitblit v1.9.1