From 6278a11e191892ae672eba0dce6d8990283327a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 22 Jul 2021 17:52:38 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..ec6709b 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
@@ -20,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -45,6 +46,9 @@
@Autowired
private MenuMapper menuMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
public void allotMenus(Map<String, Object> parameters) {
@@ -56,26 +60,25 @@
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()) {
+ if (!ObjectUtils.isEmpty(menuIds)) {
menuIds.forEach(menuId -> {
menus.add(menuMapper.selectById(menuId).getName());
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);
});
}
-
//������
String groupName = groupMapper.selectById((Integer) parameters.get("groupId")).getGroupName();
- String content = "���������" + groupName + "������������������" + menus.toString();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ String content = "���������" + groupName + "������������������" + menus;
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
}
@Override
--
Gitblit v1.8.0