From 63b7d86ec70171ddb2c1cbe0cdddea57c4313889 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 07 四月 2021 14:28:09 +0800
Subject: [PATCH] 社保档位与保险类型字典表合并
---
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