From b8a0affd03b5fa9fa33cd6f870e90394c2df86c7 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
index 06ea1cb..0ad56ef 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/PermissionServiceImpl.java
@@ -239,15 +239,14 @@
if (CollUtil.isEmpty(roleIds)) {
return Collections.emptySet();
}
-
+ // 获取 tenantId
+ Long tenantId = getTenantId();
// 如果是管理员的情况下，获取全部应用菜单编号
if (roleService.hasAnySuperAdmin(roleIds)) {
MenuListReqVO reqVO = new MenuListReqVO();
- return convertSet(menuService.getAppMenuList(reqVO), MenuDO::getId);
+ return convertSet(menuService.getAppMenuList(tenantId, reqVO), MenuDO::getId);
}
// 如果是非管理员的情况下，获得拥有的应用菜单编号
- // 获取 tenantId
- Long tenantId = getTenantId();
TenantDO tenant = tenantService.getTenant(tenantId);
TenantPackageDO tenantPackage = tenantPackageService.getTenantPackage(tenant.getPackageId());
Set<Long> menuIds = tenantPackage.getMenuIds();
--
Gitblit v1.9.3