From 76743b009ca5ea67557fcab597b332f8d1947813 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 14:09:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java
index 5438a35..08d9c28 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java
@@ -10,6 +10,7 @@
import com.iailab.module.system.controller.admin.app.vo.AppPageReqVO;
import com.iailab.module.system.controller.admin.app.vo.AppRespVO;
import com.iailab.module.system.controller.admin.app.vo.AppSaveReqVO;
+import com.iailab.module.system.controller.admin.auth.vo.AuthPermissionInfoRespVO;
import com.iailab.module.system.dal.dataobject.app.AppDO;
import com.iailab.module.system.service.app.AppService;
import io.swagger.v3.oas.annotations.Operation;
@@ -85,14 +86,14 @@
return success(BeanUtils.toBean(appDOS, AppRespVO.class));
}
-// @GetMapping("/getAppMenu")
-// @Operation(summary = "获得应用菜单列表")
-// @PreAuthorize("@ss.hasPermission('system:app-menu:query')")
-// @Parameter(name = "id", description = "ID", required = true, example = "1024")
-// public CommonResult<List<AppRespVO>> getAppMenu(@RequestParam("id") Long id) {
-// List<AppMenuRespDTO> appDOS = appService.getAppMenu(id);
-// return success(BeanUtils.toBean(appDOS, AppRespVO.class));
-// }
+ @GetMapping("/getAppMenu")
+ @Operation(summary = "获得应用菜单列表")
+ @PreAuthorize("@ss.hasPermission('system:app-menu:query')")
+ @Parameter(name = "id", description = "ID", required = true, example = "1024")
+ public CommonResult<List<AppRespVO>> getAppMenu(@RequestParam("id") Long id) {
+ List<AuthPermissionInfoRespVO.MenuVO> appDOS = appService.getAppMenu(id);
+ return success(BeanUtils.toBean(appDOS, AppRespVO.class));
+ }
@GetMapping("/export-excel")
@Operation(summary = "导出租户 Excel")
--
Gitblit v1.9.3