From 436f8eb737b6b4051d7fcb9c61874271fd12be9f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 31 十二月 2019 18:45:15 +0800
Subject: [PATCH] 部门顶级节点逻辑优化
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 15 ++++++++-------
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java | 2 --
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index dc33e89..3ecbc00 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -124,8 +124,6 @@
long currentTime = System.currentTimeMillis();
if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
{
- String token = loginUser.getToken();
- loginUser.setToken(token);
refreshToken(loginUser);
}
}
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..338e2a6 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())
--
Gitblit v1.9.2