From 9503c1ebb3fbb68fb8259bea87097d010846e2d5 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 18 六月 2025 08:59:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev-test' into feature/ai
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/permission/MenuController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/permission/MenuController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/permission/MenuController.java
index 67553f1..38b305a 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/permission/MenuController.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/permission/MenuController.java
@@ -21,7 +21,9 @@
import java.util.Comparator;
import java.util.List;
+import static com.iailab.framework.common.pojo.CommonResult.error;
import static com.iailab.framework.common.pojo.CommonResult.success;
+import static com.iailab.framework.tenant.core.context.TenantContextHolder.getTenantId;
@Tag(name = "管理后台 - 菜单")
@RestController
@@ -96,7 +98,13 @@
@Operation(summary = "获取应用菜单列表", description = "用于【应用菜单】界面")
@PreAuthorize("@ss.hasPermission('system:app-menu:query')")
public CommonResult<List<MenuRespVO>> getAppMenuList(MenuListReqVO reqVO) {
- List<MenuDO> list = menuService.getAppMenuList(reqVO);
+ // 获取 tenantId
+ Long tenantId = getTenantId();
+ // 管理员租户不在此管理菜单
+ if(tenantId == 1l) {
+ return error(-1, "管理员租户请在“菜单管理”中管理菜单！");
+ }
+ List<MenuDO> list = menuService.getAppMenuList(tenantId, reqVO);
list.sort(Comparator.comparing(MenuDO::getSort));
return success(BeanUtils.toBean(list, MenuRespVO.class));
}
@@ -105,8 +113,7 @@
@Operation(summary = "获取菜单精简信息列表", description = "只包含被开启的菜单，用于【角色分配菜单】功能的选项。" +
"在多租户的场景下，会只返回租户所在套餐有的菜单")
public CommonResult<List<MenuSimpleRespVO>> getSimpleMenuList() {
- List<MenuDO> list = menuService.getMenuListByTenant(
- new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
+ List<MenuDO> list = menuService.getMenuListByTenant(new MenuListReqVO());
list.sort(Comparator.comparing(MenuDO::getSort));
return success(BeanUtils.toBean(list, MenuSimpleRespVO.class));
}
--
Gitblit v1.9.3