From dcdfc93b50febf61301832d91dfcddcfa1ca5403 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 14:06:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index d8ec24f..c24da8d 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -52,19 +52,19 @@
Long roleId = getUser().getRoleId();
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
- List<Long> leaderIds = new ArrayList<>();
+ List<Long> leaderIdList = new ArrayList<>();
if (null != leaderId) {
- leaderIds.add(role.getId());
+ leaderIdList.add(role.getId());
while (leaderId != null) {
Role leader = roleService.selectById(leaderId);
- leaderIds.add(leader.getId());
+ leaderIdList.add(leader.getId());
leaderId = leader.getLeader();
}
}
- List<User> userList = userService.selectUserList(leaderIds,curr,limit);
+ List<User> userList = userService.selectUserList(leaderIdList.isEmpty() ? null:leaderIdList,curr,limit);
Page<User> page = new Page<User>(curr,limit).setRecords(userList);
- page.setTotal(userService.selectUserListTotal(leaderIds));
+ page.setTotal(userService.selectUserListTotal(leaderIdList.isEmpty() ? null:leaderIdList));
return R.ok(page);
}
--
Gitblit v1.9.1