|
|
|
@ -143,7 +143,7 @@ public class ChanjetManager {
|
|
|
|
|
QueryDepartmentResVO queryDept = voList.get(0);
|
|
|
|
|
QueryDepartmentResVO.ParentVO parent = queryDept.getParent();
|
|
|
|
|
QueryDepartmentResVO.DirectorVO director = queryDept.getDirector();
|
|
|
|
|
long parentId = parent != null && parent.getId() != null ? parent.getId() : 0;
|
|
|
|
|
Long parentId = (parent != null && parent.getId() != null) ? parent.getId() : null;
|
|
|
|
|
Long leaderUserId = null;
|
|
|
|
|
if(director != null && !StringUtils.isEmpty(director.getCode())){
|
|
|
|
|
AdminUserDO adminUserDO = adminUserService.getUserByUsername(director.getCode());
|
|
|
|
@ -204,7 +204,7 @@ public class ChanjetManager {
|
|
|
|
|
QueryDepartmentResVO queryDept = voList.get(0);
|
|
|
|
|
QueryDepartmentResVO.ParentVO parent = queryDept.getParent();
|
|
|
|
|
QueryDepartmentResVO.DirectorVO director = queryDept.getDirector();
|
|
|
|
|
Long parentId = parent != null && parent.getId() != null ? parent.getId() : null;
|
|
|
|
|
Long parentId = (parent != null && parent.getId() != null) ? parent.getId() : null;
|
|
|
|
|
Long leaderUserId = null;
|
|
|
|
|
if(director != null && !StringUtils.isEmpty(director.getCode())){
|
|
|
|
|
AdminUserDO adminUserDO = adminUserService.getUserByUsername(director.getCode());
|
|
|
|
|