diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserDataScopeFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserDataScopeFactory.java index ac7b65219..c1eafd0ef 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserDataScopeFactory.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/factory/UserDataScopeFactory.java @@ -78,11 +78,11 @@ public class UserDataScopeFactory { case COMPANY_WITH_CHILD: // 获取本部门及以下部门有哪些部门 - Set subCompanyOrgIdList = dbOperatorApi.findSubListByParentId("sys_hr_organization", "org_pids", "org_id", userRoleDataScopeConfig.getUserDeptId()); + Set subCompanyOrgIdList = dbOperatorApi.findSubListByParentId("sys_hr_organization", "org_pids", "org_id", userRoleDataScopeConfig.getUserCompanyId()); if (ObjectUtil.isEmpty(subCompanyOrgIdList)) { subCompanyOrgIdList = new HashSet<>(); } - subCompanyOrgIdList.add(userRoleDataScopeConfig.getUserDeptId()); + subCompanyOrgIdList.add(userRoleDataScopeConfig.getUserCompanyId()); // 获取部门下的用户 Set subCompanyUserIdList = sysUserOrgService.getOrgUserIdList(subCompanyOrgIdList);