From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Aug 2021 11:15:29 +0800
Subject: [PATCH] kafa数据从redis获取型号,当前组织下走航车设备列表

---
 screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index ec6709b..afb4821 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -52,12 +52,9 @@
     @Override
     @Transactional
     public void allotMenus(Map<String, Object> parameters) {
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String token = request.getHeader("token");
-
         Integer groupId = Integer.parseInt(parameters.get("groupId").toString());
         List<Integer> menuIds = (ArrayList) parameters.get("menuIds");
-        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
         Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
         UpdateWrapper<GroupMenu> deleteWrapper = new UpdateWrapper<>();
         deleteWrapper.eq("group_id", groupId).eq("channel_key", Constants.WEB_CHANNEL);
@@ -78,7 +75,7 @@
         //������
         String groupName = groupMapper.selectById((Integer) parameters.get("groupId")).getGroupName();
         String content = "���������" + groupName + "������������������" + menus;
-        operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+        operationLogUtils.insertLog(content, Constants.UPDATE_OPERATE_TYPE);
     }
 
     @Override

--
Gitblit v1.8.0