xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-18 03:16:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update system/department/manager/DepartmentCacheManager.java.

Browse Source 
修改 recursiveBuildTree方法，使返回值中的setSelfAndAllChildrenIdList是以当前节点为根节点的层序遍历结果

Signed-off-by: C-ccc <2170639886@qq.com>
This commit is contained in:
C-ccc 2024-07-25 08:36:58 +00:00 committed by Gitee
parent ac7c9940bf
commit 6f3d7dc3a2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
View File

@ -143,11 +143,13 @@ public class DepartmentCacheManager {
/** /**
* 构建所有根节点的下级树形结构 * 构建所有根节点的下级树形结构
* * 返回值为层序遍历结果
* [由于departmentDao中listAll给出数据根据Sort降序 所以同一层中Sort值较大的优先遍历]
*/ */
private void recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) { private List<Long> recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) {
int nodeSize = nodeList.size(); int nodeSize = nodeList.size();
for (int i = 0; i < nodeSize; i++) { List<Long> childIdList = new ArrayList<>();
for(int i = 0; i < nodeSize; i++) {
int preIndex = i - 1; int preIndex = i - 1;
int nextIndex = i + 1; int nextIndex = i + 1;
DepartmentTreeVO node = nodeList.get(i); DepartmentTreeVO node = nodeList.get(i);
@ -158,16 +160,34 @@ public class DepartmentCacheManager {
node.setNextId(nodeList.get(nextIndex).getDepartmentId()); node.setNextId(nodeList.get(nextIndex).getDepartmentId());
} }
ArrayList<Long> selfAndAllChildrenIdList = Lists.newArrayList();
selfAndAllChildrenIdList.add(node.getDepartmentId());
node.setSelfAndAllChildrenIdList(selfAndAllChildrenIdList);
List<DepartmentTreeVO> children = getChildren(node.getDepartmentId(), allDepartmentList); List<DepartmentTreeVO> children = getChildren(node.getDepartmentId(), allDepartmentList);
List<Long> tempChildIdList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(children)) { if (CollectionUtils.isNotEmpty(children)) {
node.setChildren(children); node.setChildren(children);
this.recursiveBuildTree(children, allDepartmentList); tempChildIdList = this.recursiveBuildTree(children, allDepartmentList);
} }
if(CollectionUtils.isEmpty(node.getSelfAndAllChildrenIdList())) {
node.setSelfAndAllChildrenIdList(
new ArrayList<>()
);
} }
node.getSelfAndAllChildrenIdList().add(node.getDepartmentId());
if(CollectionUtils.isNotEmpty(tempChildIdList)) {
node.getSelfAndAllChildrenIdList().addAll(tempChildIdList);
childIdList.addAll(tempChildIdList);
}
}
// 保证本层遍历顺序
for(int i = nodeSize - 1; i >= 0; i--) {
childIdList.add(0, nodeList.get(i).getDepartmentId());
}
return childIdList;
} }