From b3204224f9ba08969dbdf383849ed91a04279156 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 11:38:53 +0800
Subject: [PATCH] screen-manage 修复更新设备的站点不判断组织的bug
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index f37282e..f03442c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -49,8 +49,14 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
- public Map<String, Object> addGroup(Group group, String token) {
+ public Map<String, Object> addGroup(Group group) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -66,10 +72,10 @@
}
group.setOrganizationId(orgId);
groupMapper.insert(group);
+
//������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -78,22 +84,26 @@
//������������group
group.setIsDelete(Constants.DELETE);
groupMapper.updateById(group);
- //������������group_menu
+ //������group_menu
UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
- deleteGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
- groupMenuMapper.update(null, deleteGroupWrapper);
- //������������user_group
+ deleteGroupWrapper.eq("group_id", group.getId());
+ groupMenuMapper.delete(deleteGroupWrapper);
+ //������user_group
UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
- deleteUserGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
- userGroupMapper.update(null, deleteUserGroupWrapper);
+ deleteUserGroupWrapper.eq("group_id", group.getId());
+ userGroupMapper.delete(deleteUserGroupWrapper);
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
- public Map<String, Object> updateGroup(Group group, String token) {
+ public Map<String, Object> updateGroup(Group group) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ String before = groupMapper.selectById(group.getId()).getGroupName();
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -111,15 +121,17 @@
group.setOrganizationId(orgId);
groupMapper.updateById(group);
//������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content);
+ String content = "���������������" + before + "=>" + group.getGroupName();
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
return result;
}
@Override
public Page<Group> selectGroups(Map<String, Object> parameters) {
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.8.0