|
|
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.google.common.collect.Lists;
|
|
|
-import com.google.common.collect.Maps;
|
|
|
import com.inspur.customer.client.keycloak.KeycloakService;
|
|
|
import com.inspur.customer.client.org.SmsbDepartmentService;
|
|
|
import com.inspur.customer.client.org.SmsbDepartmentUserService;
|
|
|
@@ -416,14 +415,16 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
|
|
|
map.put(dep.getPath(), dep.getName());
|
|
|
} else {
|
|
|
StringBuilder sb = new StringBuilder(dep.getName());
|
|
|
+ Long parentId = dep.getParentId();
|
|
|
while (true) {
|
|
|
- SmsbDepartmentDO parent = this.getById(dep.getParentId());
|
|
|
+ SmsbDepartmentDO parent = this.getById(parentId);
|
|
|
if (parent != null) {
|
|
|
sb.insert(0,parent.getName()+"/");
|
|
|
}
|
|
|
if (parent == null || parent.getParentId() == null) {
|
|
|
break;
|
|
|
}
|
|
|
+ parentId = parent.getParentId();
|
|
|
}
|
|
|
map.put(dep.getPath(), sb.toString());
|
|
|
}
|