From a195df175f3031d682eccd1fc764ad2033d92b5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 18 六月 2020 15:07:56 +0800
Subject: [PATCH] 修正定时任务日志权限字符
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index cc51d49..4e0ef4a 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -49,18 +49,19 @@
public List<SysDept> buildDeptTree(List<SysDept> depts)
{
List<SysDept> returnList = new ArrayList<SysDept>();
- if (StringUtils.isNotEmpty(depts) && StringUtils.isNotNull(depts.stream().findFirst()))
+ List<Long> tempList = new ArrayList<Long>();
+ for (SysDept dept : depts)
{
- depts.stream().findFirst().get().setParentId(null);
+ tempList.add(dept.getDeptId());
}
for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
{
- SysDept t = (SysDept) iterator.next();
- // 根据传入的某个父节点ID,遍历该父节点的所有子节点
- if (StringUtils.isNull(t.getParentId()) || t.getParentId() == 0)
+ SysDept dept = (SysDept) iterator.next();
+ // 如果是顶级节点, 遍历该父节点的所有子节点
+ if (!tempList.contains(dept.getParentId()))
{
- recursionFn(depts, t);
- returnList.add(t);
+ recursionFn(depts, dept);
+ returnList.add(dept);
}
}
if (returnList.isEmpty())
@@ -108,6 +109,18 @@
}
/**
+ * 根据ID查询所有子部门（正常状态）
+ *
+ * @param deptId 部门ID
+ * @return 子部门数
+ */
+ @Override
+ public int selectNormalChildrenDeptById(Long deptId)
+ {
+ return deptMapper.selectNormalChildrenDeptById(deptId);
+ }
+
+ /**
* 是否存在子节点
*
* @param deptId 部门ID
--
Gitblit v1.9.2