Merge remote-tracking branch 'origin/master'

yz

2021-03-15 c12ca804e93a7f62b006dca60fa3d8797e0480d8

 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();
        }
    }
}