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 | 8 +++++++-
1 files changed, 7 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 362e614..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);
}
@@ -227,7 +233,7 @@
SysDepartment byId = this.getById(sysDepartmentVO.getParentId());
childrenMap = getChildrenDepartmentMap(byId);
sysDepartmentVO = fillChildrenTreeModel(byId, childrenMap);
- sysDepartmentVO.setChildren(new ArrayList<>());
+// sysDepartmentVO.setChildren(new ArrayList<>());
}
if (sysDepartmentVO.getTreeCode().length()==10){
SysDepartment sysDepartment = this.baseMapper.selectById(sysDepartmentVO.getParentId());
--
Gitblit v1.7.1