From ef7468a561f65729921bb80eba8dbedd71513bce Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期四, 27 三月 2025 15:29:37 +0800
Subject: [PATCH] bug
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 b15b780..0c25b7b 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
@@ -150,6 +150,7 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .ne(SysDepartment::getOrgType , 4)
.likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
@@ -219,6 +220,13 @@
// }
Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentMap(currentDepartment);
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ Integer orgType = sysDepartmentVO.getOrgType();
+ if (sysDepartmentVO.getOrgType()==4){
+ SysDepartment byId = this.getById(sysDepartmentVO.getParentId());
+ childrenMap = getChildrenDepartmentMap(byId);
+ sysDepartmentVO = fillChildrenTreeModel(byId, childrenMap);
+ sysDepartmentVO.setChildren(new ArrayList<>());
+ }
if (sysDepartmentVO.getTreeCode().length()==10){
SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
@@ -233,7 +241,7 @@
SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
List<SysDepartmentVO> root1 = new ArrayList<>();
- root1.add(sysDepartmentVO);
+ root1.add(sysDepartmentVO);
sysDepartmentVO1.setChildren(root1);
@@ -242,7 +250,7 @@
BeanUtils.copyProperties(sysDepartment2,sysDepartmentVO2);
List<SysDepartmentVO> root2 = new ArrayList<>();
root2.add(sysDepartmentVO1);
- sysDepartmentVO2.setChildren(root2);
+ sysDepartmentVO2.setChildren(root2);
sysDepartmentVO = sysDepartmentVO2;
}
root.add(sysDepartmentVO);
--
Gitblit v1.7.1