diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java
index ed44a4007..872125946 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java
@@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import cn.stylefeng.roses.kernel.db.mp.tenant.context.TenantSwitchContext;
 import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher;
 import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil;
 import cn.stylefeng.roses.kernel.sys.api.SysUserRoleServiceApi;
@@ -67,7 +68,9 @@ public class PermissionAssignServiceImpl implements PermissionAssignService {
         Set<Long> userRoleLimitScope = userRoleServiceApi.findCurrentUserRoleLimitScope();
 
         // 2. 整理出一个总的响应的结构树，选择状态为空
-        RoleBindPermissionResponse selectTreeStructure = this.createSelectTreeStructure(userRoleLimitScope);
+        RoleBindPermissionResponse selectTreeStructure = TenantSwitchContext.me().doNoTenantChange(() -> {
+            return this.createSelectTreeStructure(userRoleLimitScope);
+        });
 
         // 3. 获取角色绑定的应用，菜单，功能列表
         Set<Long> roleBindMenusAndOptions = this.getRoleBindMenusAndOptions(roleBindPermissionRequest.getRoleId());