From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index b80e6fd..2e18db4 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -166,6 +166,11 @@
private String createALlDeptName(Dept dept){
Dept parent = this.getById(dept.getParentId());
- return parent.getAllDeptName() + "/" + dept.getDeptName();
+ String parentName = parent.getAllDeptName();
+ if(StringUtils.isNotBlank(parentName)) {
+ return parent.getAllDeptName() + "/" + dept.getDeptName();
+ } else {
+ return dept.getDeptName();
+ }
}
}
--
Gitblit v1.8.0