From b9a97ef4aa676f0fb39427c6eed2c78bbab4f044 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 31 十二月 2019 17:04:19 +0800
Subject: [PATCH] 修改验证码记录提示错误
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..cc51d49 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,11 +49,15 @@
public List<SysDept> buildDeptTree(List<SysDept> depts)
{
List<SysDept> returnList = new ArrayList<SysDept>();
+ if (StringUtils.isNotEmpty(depts) && StringUtils.isNotNull(depts.stream().findFirst()))
+ {
+ depts.stream().findFirst().get().setParentId(null);
+ }
for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
{
SysDept t = (SysDept) iterator.next();
// 根据传入的某个父节点ID,遍历该父节点的所有子节点
- if (t.getParentId() == 0)
+ if (StringUtils.isNull(t.getParentId()) || t.getParentId() == 0)
{
recursionFn(depts, t);
returnList.add(t);
@@ -271,7 +275,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