From 45ab609a4bfee635162b8947380c858964c9be74 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 16:48:35 +0800
Subject: [PATCH] 基础字段

---
 server/company/src/main/java/com/doumee/api/system/SystemMenuController.java |   11 +++++++----
 1 files changed, 7 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 8eb4e56..3461a1b 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
@@ -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;
@@ -42,14 +43,16 @@
     @ApiOperation("鏌ヨ鑿滃崟鏍�")
     @GetMapping("/treeNodes")
     public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
-        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+        LoginUserInfo loginUserInfo = this.getLoginUser();
+        return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
     }
 
     @ApiOperation("鏌ヨ鍒楄〃鏍�")
-    @PostMapping("/treeList/{type}")
+    @PostMapping("/treeList")
     @RequiresPermissions("system:menu:query")
-    public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
-        return ApiResponse.success(systemMenuBiz.findTreeByType(type));
+    public ApiResponse<List<SystemMenuListVO>> findTree () {
+        LoginUserInfo loginUserInfo = this.getLoginUser();
+        return ApiResponse.success(systemMenuBiz.findTreeByType(loginUserInfo.getType()));
     }
 
     @PreventRepeat

--
Gitblit v1.9.3