diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java index 97fe29d4..9bf37947 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java @@ -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());