From 5f07ddc52c8643695049c0395aa73efc913ca69d Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期二, 30 七月 2024 09:50:46 +0800
Subject: [PATCH] 修改：会话监听事件增加日志打印

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java |   99 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 88 insertions(+), 11 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..efd07f5 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;
@@ -62,6 +59,12 @@
     public List<TreeSelect> selectDeptTreeList(SysDept dept)
     {
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
+    @Override
+    public List<TreeSelect> selectDeptTreeListNoDataScope(SysDept dept) {
+        List<SysDept> depts = deptMapper.selectDeptListNoDataScope(dept);
         return buildDeptTreeSelect(depts);
     }
 
@@ -362,7 +365,7 @@
     @Override
     public List<SysDept> allByUser(List<Long> deptList) {
         QueryWrapper<SysDept> queryWrapper = new QueryWrapper();
-        queryWrapper.in("dept_id",deptList);
+        queryWrapper.in("dept_id",deptList).eq("del_flag","0");
         return deptMapper.selectList(queryWrapper);
     }
 
@@ -397,13 +400,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 +432,76 @@
     {
         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;
+    }
+
+    @Override
+    public List<Long> selectDeptIdBySubAndUserId(Long deptId, String usersId) {
+        List<Long> deptIdList = new ArrayList();
+        //鏈骇鍙婁笅灞為儴闂�
+        List<Long> ownAndSubDeptIdList = deptMapper.selectDeptIdBySub(deptId);
+        //鑷畾涔�
+        List<Long> roleDeptIdList = deptMapper.selectRoleDeptIdByUsersId(usersId);
+        //鍘婚噸
+        Set<Long> deptIdSet = new HashSet();
+        deptIdSet.addAll(ownAndSubDeptIdList);
+        deptIdSet.addAll(roleDeptIdList);
+        deptIdList.addAll(deptIdSet);
+        return deptIdList;
+    }
+
+    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