From 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 九月 2023 11:59:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev --- server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 8eb4e56..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 @@ -5,6 +5,7 @@ import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.constants.OperaType; import com.doumee.core.model.ApiResponse; +import com.doumee.core.model.LoginUserInfo; import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO; import com.doumee.dao.system.model.SystemMenu; import com.doumee.dao.system.vo.SystemMenuListVO; @@ -41,8 +42,9 @@ @ApiOperation("鏌ヨ鑿滃崟鏍�") @GetMapping("/treeNodes") - public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () { - return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId())); + public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu (@RequestParam Integer type) { + LoginUserInfo loginUserInfo = this.getLoginUser(); + return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),type)); } @ApiOperation("鏌ヨ鍒楄〃鏍�") -- Gitblit v1.9.3