From a5c2490c20876d07ffb41c561505cd55a10121b2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 三月 2025 09:48:25 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index 5f66a4f..89a7ca4 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -139,6 +139,7 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentByOrgType(SysDepartment myDepartment, List<Integer> orgTypes) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .in(CollUtils.isNotEmpty(orgTypes), SysDepartment::getOrgType, orgTypes)
.likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
@@ -146,6 +147,15 @@
.collect(Collectors.groupingBy(SysDepartment::getParentId));
}
+ @NotNull
+ private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
+ List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
+ .orderByDesc(SysDepartment::getCreateTime)
+ .list();
+ return sysDepartmentList.stream()
+ .collect(Collectors.groupingBy(SysDepartment::getParentId));
+ }
@Override
public SysDepartment getDepartmentByParentId(Long parentId) {
return this.lambdaQuery().eq(SysDepartment::getId, parentId).one();
@@ -207,7 +217,7 @@
// if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
// return root;
// }
- Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
if (sysDepartmentVO.getTreeCode().length()==10){
SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
--
Gitblit v1.7.1