From 2211a75704860d9e6ae9dd02602746b14ad1e67f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 17 七月 2020 09:24:04 +0800
Subject: [PATCH] 编码文件名修改为uuid方式
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 f4e4dec..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,14 +49,19 @@
public List<SysDept> buildDeptTree(List<SysDept> depts)
{
List<SysDept> returnList = new ArrayList<SysDept>();
+ List<Long> tempList = new ArrayList<Long>();
+ for (SysDept dept : depts)
+ {
+ tempList.add(dept.getDeptId());
+ }
for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
{
- SysDept t = (SysDept) iterator.next();
- // 根据传入的某个父节点ID,遍历该父节点的所有子节点
- if (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())
@@ -101,6 +106,18 @@
public SysDept selectDeptById(Long deptId)
{
return deptMapper.selectDeptById(deptId);
+ }
+
+ /**
+ * 根据ID查询所有子部门（正常状态）
+ *
+ * @param deptId 部门ID
+ * @return 子部门数
+ */
+ @Override
+ public int selectNormalChildrenDeptById(Long deptId)
+ {
+ return deptMapper.selectNormalChildrenDeptById(deptId);
}
/**
@@ -271,7 +288,7 @@
while (it.hasNext())
{
SysDept n = (SysDept) it.next();
- if (n.getParentId().longValue() == t.getDeptId().longValue())
+ if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
{
tlist.add(n);
}
--
Gitblit v1.9.2