From cb8db5f74edbbc4ae0f37aa089c761408cc017a5 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:29 +0800
Subject: [PATCH] #联调修改
---
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index dd474e5..b32b1e2 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -42,21 +42,16 @@
@ApiOperation("鏌ヨ鑿滃崟鏍�")
@GetMapping("/treeNodes")
- public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
+ public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu (@RequestParam Integer type) {
LoginUserInfo loginUserInfo = this.getLoginUser();
- return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
+ return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),type));
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
-<<<<<<< HEAD
- public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
- return ApiResponse.success(systemMenuBiz.findTree());
-=======
public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
return ApiResponse.success(systemMenuBiz.findTreeByType(type));
->>>>>>> a7e6a3b52c64ba9add0ceb643d6915473a7770a4
}
@PreventRepeat
--
Gitblit v1.9.3