From 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/system/SystemMenuController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
index 3461a1b..797483a 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -47,12 +47,20 @@
return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
}
+// @ApiOperation("鏌ヨ鍒楄〃鏍�")
+// @PostMapping("/treeList")
+// @RequiresPermissions("system:menu:query")
+// public ApiResponse<List<SystemMenuListVO>> findTree () {
+// LoginUserInfo loginUserInfo = this.getLoginUser();
+// return ApiResponse.success(systemMenuBiz.findTreeByType(loginUserInfo.getType()));
+// }
+
+
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList")
+ @PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
- public ApiResponse<List<SystemMenuListVO>> findTree () {
- LoginUserInfo loginUserInfo = this.getLoginUser();
- return ApiResponse.success(systemMenuBiz.findTreeByType(loginUserInfo.getType()));
+ public ApiResponse<List<SystemMenuListVO>> treeList (@PathVariable Integer type) {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(type));
}
@PreventRepeat
--
Gitblit v1.9.3