From 25e6a77fdca15feccadb9d4ccf5baf83e1bfd62a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 14:04:25 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/system/controller/UserController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 70bc84f..d8ec24f 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -43,24 +43,29 @@
convert(param, wrapper);
wrapper.orderBy("id", false);
if (9527 == getUserId()) {
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ List<User> userList = userService.selectUserList(null,curr,limit);
+ Page<User> page = new Page<User>(curr,limit).setRecords(userList);
+ page.setTotal(userService.selectUserListTotal(null));
+ return R.ok(page);
}
Long roleId = getUser().getRoleId();
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
+ List<Long> leaderIds = new ArrayList<>();
if (null != leaderId) {
- List<Long> leaderIds = new ArrayList<>();
leaderIds.add(role.getId());
while (leaderId != null) {
Role leader = roleService.selectById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
- wrapper.notIn("role_id", leaderIds);
}
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ List<User> userList = userService.selectUserList(leaderIds,curr,limit);
+ Page<User> page = new Page<User>(curr,limit).setRecords(userList);
+ page.setTotal(userService.selectUserListTotal(leaderIds));
+ return R.ok(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -92,6 +97,7 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ user.setStatus(1);
userService.insert(user);
return R.ok();
}
--
Gitblit v1.9.1