From fd03e24df897038d90ae0872d05eb321772ccf9f Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sun, 17 Mar 2024 15:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.3=E3=80=91=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=85=AC=E5=8F=B8=E7=9A=84=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/role/service/impl/UserRoleDataScopeImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 eb004d7c3..4779b5f18 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
@@ -50,7 +50,7 @@ public class UserRoleDataScopeImpl implements UserRoleDataScopeApi {
         }
 
         // 获取用户的角色id集合
-        List<Long> userRoleIdList = sysUserRoleServiceApi.getUserRoleIdList(loginUser.getUserId());
+        List<Long> userRoleIdList = sysUserRoleServiceApi.getUserRoleIdListCurrentCompany(loginUser.getUserId(), loginUser.getCurrentOrgId());
 
         // 如果这个角色列表大于1，也就是不单纯是普通角色，则将普通角色去掉，以配置的角色为主
         Long defaultRoleId = sysRoleService.getDefaultRoleId();