From 08d8933d3fe66fb83f1e2e7e4038e62b3c5143e1 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:10:43 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/system/controller/RoleController.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..e14c5e1 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -37,28 +37,32 @@
excludeTrash(param);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderBy("ID", false);
if (9527 == getUserId()) {
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+ List<Role> roleList = roleService.selectRoleList(null,curr,limit);
+ Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
+ page.setTotal(roleService.selectRoleListTotal(null));
+ return R.ok(page);
}
Long roleId = getUser().getRoleId();
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
+ List<Long> leaderIdList = new ArrayList<>();
+
if (null != leaderId) {
- List<Long> leaderIds = new ArrayList<>();
- leaderIds.add(roleId);
+ leaderIdList.add(roleId);
while (leaderId != null) {
Role leader = roleService.selectById(leaderId);
- leaderIds.add(leader.getId());
+ leaderIdList.add(leader.getId());
leaderId = leader.getLeader();
}
- wrapper.notIn("id", leaderIds);
}
-// if (null != role.getLevel()) {
-// wrapper.gt("level", role.getLevel());
-// }
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+
+ List<Role> roleList = roleService.selectRoleList(leaderIdList.isEmpty() ? null:leaderIdList,curr,limit);
+ Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
+ page.setTotal(roleService.selectRoleListTotal(leaderIdList.isEmpty() ? null:leaderIdList));
+ return R.ok(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -131,12 +135,13 @@
EntityWrapper<Role> wrapper = new EntityWrapper<>();
wrapper.like("name", condition);
// 涓婁笅绾х鐞�
+ List<Long> leaderIds = new ArrayList<>();
+
if (9527 != getUserId()) {
Long roleId = getUser().getRoleId();
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
- List<Long> leaderIds = new ArrayList<>();
while (leaderId != null) {
Role leader = roleService.selectById(leaderId);
leaderIds.add(leader.getId());
@@ -149,7 +154,12 @@
// }
}
- Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+// Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+
+ List<Role> roleList = roleService.selectRoleList((Cools.isEmpty(leaderIds) || leaderIds.isEmpty())? null : leaderIds,0,10);
+ Page<Role> page = new Page<Role>(0,10).setRecords(roleList);
+ page.setTotal(roleService.selectRoleListTotal((Cools.isEmpty(leaderIds) || leaderIds.isEmpty())? null : leaderIds));
+
List<Map<String, Object>> result = new ArrayList<>();
for (Role role : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1