From 1487a187cc4e9daf2b733626929c77e945c926fe Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 14:36:56 +0800
Subject: [PATCH] app任务管理组织架构

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java |  129 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 124 insertions(+), 5 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 a7e0212..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,11 +4,10 @@
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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;
@@ -358,10 +357,130 @@
     }
 
     @Override
-    public List<TreeSelectWell> wellTree(List<SysDept> depts) {
-        List<SysDept> deptTrees = buildDeptTree(depts);
-        return deptTrees.stream().map(TreeSelectWell::new).collect(Collectors.toList());
+    public List<SysDept> allByUser(List<Long> deptList) {
+        QueryWrapper<SysDept> queryWrapper = new QueryWrapper();
+        queryWrapper.in("dept_id",deptList);
+        return deptMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<TreeDeptWell> wellTree(List<TreeDeptWell> depts) {
+        List<TreeDeptWell> deptTrees = buildDeptWellTree(depts);
+        return deptTrees;
+//        return deptTrees.stream().map(TreeSelectWell::new).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<TreeDeptWell> buildDeptWellTree(List<TreeDeptWell> depts)
+    {
+        List<TreeDeptWell> returnList = new ArrayList<TreeDeptWell>();
+        List<Long> tempList = depts.stream().map(TreeDeptWell::getDeptId).collect(Collectors.toList());
+        for (TreeDeptWell dept : depts)
+        {
+            // 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
+            if (!tempList.contains(dept.getParentId()))
+            {
+                recursionFnWell(depts, dept);
+                returnList.add(dept);
+            }
+        }
+        if (returnList.isEmpty())
+        {
+            returnList = depts;
+        }
+        return returnList;
+    }
+
+    private void recursionFnWell(List<TreeDeptWell> list, TreeDeptWell t)
+    {
+        // 寰楀埌瀛愯妭鐐瑰垪琛�
+        if(t.getId() == null){
+            List<TreeDeptWell> childList = getChildListWell(list, t);
+            t.setChildren(childList);
+            for (TreeDeptWell tChild : childList)
+            {
+                if (hasChildWell(list, tChild))
+                {
+                    recursionFnWell(list, tChild);
+                }
+            }
+        }
+    }
+
+    private List<TreeDeptWell> getChildListWell(List<TreeDeptWell> list, TreeDeptWell t)
+    {
+        List<TreeDeptWell> tlist = new ArrayList<TreeDeptWell>();
+        Iterator<TreeDeptWell> it = list.iterator();
+        while (it.hasNext())
+        {
+            TreeDeptWell n = (TreeDeptWell) it.next();
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
+
+    private boolean hasChildWell(List<TreeDeptWell> list, TreeDeptWell t)
+    {
+        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