From 1703c96b6833244340dc10bf746d8c08a331008c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 11:22:18 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName

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