From 543941f345319f29f92d9be2529d41868bc3cf80 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 18 六月 2021 15:03:26 +0800
Subject: [PATCH] fix(bug修复): 相关证件多项查询修改

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
index 0c0c464..37309ef 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
@@ -70,7 +70,9 @@
         depts.forEach(dept -> {
             DeptTree tree = new DeptTree();
             tree.setId(dept.getFolderid().toString());
-            tree.setParentId(dept.getParentId().toString());
+            if(dept.getParentId()!=null){
+                tree.setParentId(dept.getParentId().toString());
+            }
             tree.setLabel(dept.getFoldername());
             tree.setOrderNum(dept.getSort());
             trees.add(tree);

--
Gitblit v1.8.0