From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 cbe63bf..c2c1014 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
@@ -92,6 +92,12 @@
case 5:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
break;
+ case 6:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
+ break;
+ case 7:
+ childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
+ break;
default:
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
}
@@ -150,6 +156,9 @@
@NotNull
private Map<Long, List<SysDepartment>> getChildrenDepartmentMap(SysDepartment myDepartment) {
List<SysDepartment> sysDepartmentList = this.lambdaQuery()
+ .ne(SysDepartment::getOrgType , 4)
+ .ne(SysDepartment::getOrgType , 3)
+ .ne(SysDepartment::getOrgType , 2)
.likeRight(SysDepartment::getTreeCode, myDepartment.getTreeCode())
.orderByDesc(SysDepartment::getCreateTime)
.list();
@@ -219,6 +228,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();
@@ -228,12 +244,12 @@
sysDepartmentVO1.setChildren(root1);
sysDepartmentVO = sysDepartmentVO1;
}
- if (sysDepartmentVO.getTreeCode().length()==14){
+ if (sysDepartmentVO.getTreeCode().length()>=14){
SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
SysDepartmentVO sysDepartmentVO1 = new SysDepartmentVO();
BeanUtils.copyProperties(sysDepartment,sysDepartmentVO1);
List<SysDepartmentVO> root1 = new ArrayList<>();
- root1.add(sysDepartmentVO);
+ root1.add(sysDepartmentVO);
sysDepartmentVO1.setChildren(root1);
@@ -242,7 +258,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