From 1f19fc38b37ed1aa96802702ca406ab740a8aa6c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 15:35:49 +0800
Subject: [PATCH] RTU列表
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index e0a4d85..0d33856 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.HealthVo;
import com.ruoyi.common.core.domain.TreeDeptWell;
import com.ruoyi.common.core.domain.TreeSelectWell;
import org.springframework.stereotype.Service;
@@ -366,9 +367,10 @@
}
@Override
- public List<TreeSelectWell> wellTree(List<TreeDeptWell> depts) {
+ public List<TreeDeptWell> wellTree(List<TreeDeptWell> depts) {
List<TreeDeptWell> deptTrees = buildDeptWellTree(depts);
- return deptTrees.stream().map(TreeSelectWell::new).collect(Collectors.toList());
+ return deptTrees;
+// return deptTrees.stream().map(TreeSelectWell::new).collect(Collectors.toList());
}
@Override
@@ -395,13 +397,15 @@
private void recursionFnWell(List<TreeDeptWell> list, TreeDeptWell t)
{
// 寰楀埌瀛愯妭鐐瑰垪琛�
- List<TreeDeptWell> childList = getChildListWell(list, t);
- t.setChildren(childList);
- for (TreeDeptWell tChild : childList)
- {
- if (hasChildWell(list, tChild))
+ if(t.getId() == null){
+ List<TreeDeptWell> childList = getChildListWell(list, t);
+ t.setChildren(childList);
+ for (TreeDeptWell tChild : childList)
{
- recursionFnWell(list, tChild);
+ if (hasChildWell(list, tChild))
+ {
+ recursionFnWell(list, tChild);
+ }
}
}
}
--
Gitblit v1.9.3