From db6a13645ba212dee0ef46548cc3468d30b76873 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 24 五月 2021 21:29:05 +0800
Subject: [PATCH] feat(定时更新基本信息表的部门名称与全称):

---
 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