From 2aa0ffa6eea188f44eabc50617ddf97c804fc89f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 16:32:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..85bdae2 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
--
Gitblit v1.9.3