diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java index 3d93326..bf06002 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java @@ -671,28 +671,28 @@ public class AdminUserServiceImpl implements AdminUserService { if (deptId == null) { return null; } - + DeptDO dept = deptService.getDept(deptId); if (dept == null) { return null; } - + // 顶级部门ID (parentId=0) if (dept.getParentId().equals(0L)) { return dept.getId(); } - + // 直接是二级部门 (parentId=100) if (dept.getParentId().equals(100L)) { return dept.getId(); } - + // 递归查找父部门链中parentId=100的部门 Long result = findParentDeptWithParentId(dept.getParentId(), 100L); // 如果找不到parentId=100的部门,返回当前部门的id作为默认值 return result != null ? result : dept.getParentId(); } - + /** * 递归查找父部门链中parentId等于目标值的部门ID * @param currentDeptId 当前部门ID @@ -703,22 +703,22 @@ public class AdminUserServiceImpl implements AdminUserService { if (currentDeptId == null) { return null; } - + DeptDO dept = deptService.getDept(currentDeptId); if (dept == null) { return null; } - + // 找到目标父部门 if (dept.getParentId().equals(targetParentId)) { return dept.getId(); } - + // 达到顶级部门,停止递归 if (dept.getParentId().equals(0L)) { return dept.getId(); // 改为返回顶级部门ID,而不是null } - + // 继续向上查找 return findParentDeptWithParentId(dept.getParentId(), targetParentId); }