From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MenuController.java b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
index f8b69ba..2e2eaf0 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -9,8 +9,6 @@
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -55,9 +53,8 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
})
@RequestMapping(value = "menu-list", method = RequestMethod.POST)
- public ResultMessage selectMenus(HttpServletRequest request) {
- String token = request.getHeader("token");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ public ResultMessage selectMenus() {
+ Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
List<Menu> menus = menuService.getMenuList((Integer) orgInfo.get("id"));
return ResultMessage.ok(menus);
@@ -67,10 +64,9 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
})
- @RequestMapping(value = "select", method = RequestMethod.POST)
- public ResultMessage select(HttpServletRequest request) {
- String token = request.getHeader("token");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select() {
+ Map<String, Object> currentUserInfo = (Map<String, Object>)TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Map<String, Object> result = menuService.selectMenusByOrgId((Integer) orgInfo.get("id"));
return ResultMessage.ok(result);
@@ -80,7 +76,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "get-menu-ids", method = RequestMethod.GET)
+ @RequestMapping(value = "getMenuIds", method = RequestMethod.GET)
public ResultMessage getMenuIds(Integer groupId) {
List<Integer> menusIds = groupMenuService.getMenusIds(groupId);
return ResultMessage.ok(menusIds);
--
Gitblit v1.8.0