From 492bae41a21616852b8007660c679fcd37e7ea2a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 06 十一月 2023 10:16:34 +0800
Subject: [PATCH] app人员查询
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 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 85bdae2..63a92e1 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,13 +4,10 @@
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 com.ruoyi.common.core.domain.*;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -397,13 +394,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);
+ }
}
}
}
@@ -427,4 +426,61 @@
{
return getChildListWell(list, t).size() > 0;
}
+
+
+
+ @Override
+ public List<DeptUserTree> deptUserTree(List<DeptUserTree> depts)
+ {
+ List<DeptUserTree> returnList = new ArrayList<>();
+ List<Long> tempList = depts.stream().map(DeptUserTree::getDeptId).collect(Collectors.toList());
+ for (DeptUserTree dept : depts)
+ {
+ // 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
+ if (!tempList.contains(dept.getParentId()))
+ {
+ recursionFnDeptUserTree(depts, dept);
+ returnList.add(dept);
+ }
+ }
+ if (returnList.isEmpty())
+ {
+ returnList = depts;
+ }
+ return returnList;
+ }
+
+ private void recursionFnDeptUserTree(List<DeptUserTree> list, DeptUserTree t)
+ {
+ // 寰楀埌瀛愯妭鐐瑰垪琛�
+ if(t.getUserId()==null){
+ List<DeptUserTree> childList = getChildListDeptUserTree(list, t);
+ t.setChildren(childList);
+ for (DeptUserTree tChild : childList) {
+ if (hasChildDeptUserTree(list, tChild)) {
+ recursionFnDeptUserTree(list, tChild);
+ }
+ }
+ }
+ }
+
+ private List<DeptUserTree> getChildListDeptUserTree(List<DeptUserTree> list, DeptUserTree t)
+ {
+ List<DeptUserTree> tlist = new ArrayList<>();
+ Iterator<DeptUserTree> it = list.iterator();
+ while (it.hasNext())
+ {
+ DeptUserTree n = (DeptUserTree) it.next();
+ if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+ {
+ tlist.add(n);
+ }
+ }
+ return tlist;
+ }
+
+ private boolean hasChildDeptUserTree(List<DeptUserTree> list, DeptUserTree t)
+ {
+ return getChildListDeptUserTree(list, t).size() > 0;
+ }
}
--
Gitblit v1.9.3