From 2613aafec8343016a565c5e3e9e6b1ad5e6c6bab Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 09:09:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 45bdefd..7ddf506 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
@@ -45,6 +45,9 @@
@Autowired
private MenuMapper menuMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
public void allotMenus(Map<String, Object> parameters) {
@@ -56,7 +59,7 @@
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
UpdateWrapper<GroupMenu> deleteWrapper = new UpdateWrapper<>();
- deleteWrapper.eq("group_id", groupId).eq("channel", Constants.WEB_CHANNEL);
+ deleteWrapper.eq("group_id", groupId).eq("channel_key", Constants.WEB_CHANNEL);
groupMenuMapper.delete(deleteWrapper);
List<String> menus = new ArrayList<>();
if (menuIds != null && !menuIds.isEmpty()) {
@@ -65,7 +68,7 @@
GroupMenu groupMenu = new GroupMenu();
groupMenu.setGroupId(groupId);
groupMenu.setMenuId(menuId);
- groupMenu.setChannel(Constants.WEB_CHANNEL);
+ groupMenu.setChannelKey(Constants.WEB_CHANNEL);
groupMenu.setOrganizationId((Integer) orgInfo.get("id"));
groupMenuMapper.insert(groupMenu);
});
@@ -75,7 +78,7 @@
//������
String groupName = groupMapper.selectById((Integer) parameters.get("groupId")).getGroupName();
String content = "���������" + groupName + "������������������" + menus.toString();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
}
@Override
--
Gitblit v1.8.0