From 445a246de10cc5bbdedb461d61524ddeee8e2c96 Mon Sep 17 00:00:00 2001 From: stylefeng Date: Sun, 26 Jan 2025 18:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90dataScope?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/role/service/impl/UserRoleDataScopeImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java index 44d93026b..d397fcceb 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/UserRoleDataScopeImpl.java @@ -159,6 +159,9 @@ public class UserRoleDataScopeImpl implements UserRoleDataScopeApi { // 如果是32-指定机构层级及以下 else if (DataScopeTypeEnum.DEFINE_ORG_LEVEL_WITH_CHILD.getCode().equals(sysRoleDataScope.getDataScopeType())) { Long parentOrgLevelOrgId = organizationServiceApi.getParentOrgLevel(loginUser.getCurrentOrgId(), sysRoleDataScope.getOrgLevelCode()); + if (parentOrgLevelOrgId == null) { + continue; + } Set subOrgIdList = this.getPointOrgAndSub(parentOrgLevelOrgId); userOrgIdList.addAll(subOrgIdList); } @@ -192,6 +195,9 @@ public class UserRoleDataScopeImpl implements UserRoleDataScopeApi { * @since 2025/1/25 22:24 */ public Set getPointOrgAndSub(Long orgId) { + if (orgId == null) { + return CollectionUtil.set(false); + } Set subOrgIdList = this.dbOperatorApi.findSubListByParentId("sys_hr_organization", "org_pids", "org_id", orgId); subOrgIdList.add(orgId); return subOrgIdList;