From ab9346537901418d4cabd62fa5a9bff490f886be Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 02:19:12 +0800
Subject: [PATCH] 1.大屏接口 2.bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 2c02fab..860f7d8 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
@@ -90,11 +90,42 @@
childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
}
SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(myDepartment, childrenMap);
+ switch (type) {
+ case 2:
+ case 3:
+ case 4:
+ filterEmptyChildren(sysDepartmentVO.getChildren());
+ break;
+ }
root.add(sysDepartmentVO);
return root;
}
/**
+ * 移除子节点为空的区域
+ *
+ * @param departments
+ */
+ private void filterEmptyChildren(List<SysDepartmentVO> departments) {
+ if (departments == null) {
+ return;
+ }
+
+ Iterator<SysDepartmentVO> iterator = departments.iterator();
+ while (iterator.hasNext()) {
+ SysDepartmentVO department = iterator.next();
+
+ // 递归过滤子节点
+ filterEmptyChildren(department.getChildren());
+
+ // 如果 orgType == 1 且 children 为空，则移除当前节点
+ if (department.getOrgType() == 1 && department.getChildren().isEmpty()) {
+ iterator.remove();
+ }
+ }
+ }
+
+ /**
* @param myDepartment
* @param orgTypes 查询区域类型列表
* @return
--
Gitblit v1.7.1