#

1

2025-05-13 7c315b53808a66a2f1faf90930ecffdc85ba455f

 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);
    }