From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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 3f6b6ba..4152336 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
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
+import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
@@ -49,6 +50,9 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
public Map<String, Object> addGroup(Group group) {
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
@@ -72,27 +76,28 @@
//������
String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@Override
- public void deleteGroup(Group group) {
+ public void deleteGroup(Integer id) {
//������������group
- group.setIsDelete(Constants.DELETE);
- groupMapper.updateById(group);
+ UpdateWrapper<Group> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id).set("is_delete", Constants.DELETE);
+ groupMapper.update(null, updateWrapper);
//������group_menu
UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
- deleteGroupWrapper.eq("group_id", group.getId());
+ deleteGroupWrapper.eq("group_id", id);
groupMenuMapper.delete(deleteGroupWrapper);
//������user_group
UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
- deleteUserGroupWrapper.eq("group_id", group.getId());
+ deleteUserGroupWrapper.eq("group_id", id);
userGroupMapper.delete(deleteUserGroupWrapper);
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String content = "���������������" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
+ String content = "���������������" + groupMapper.selectById(id).getGroupName();
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -119,7 +124,7 @@
groupMapper.updateById(group);
//������
String content = "���������������" + before + "=>" + group.getGroupName();
- OperationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
return result;
}
@@ -133,7 +138,8 @@
Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgId)
- .eq("is_delete", Constants.NOT_DELETE);
+ .eq("is_delete", Constants.NOT_DELETE)
+ .ne("group_name", "admin");
Object order = parameters.get("order");
Object orderType = parameters.get("orderType");
Object groupName = parameters.get("groupName");
@@ -142,18 +148,9 @@
queryWrapper.like("group_name", groupName);
}
- //������������
- if (!parameters.containsKey("page")) {
- parameters.put("page", 0);
- }
- if (!parameters.containsKey("size")) {
- parameters.put("size", 10);
- }
-
int page = Integer.parseInt(parameters.get("page").toString());
int size = Integer.parseInt(parameters.get("size").toString());
Page<Group> pageData = new Page<>(page, size);
- //������������,������id������
//������������,������create_time������
if (order != null && orderType != null) {
if (Constants.ORDER_ASC.equals(orderType)) {
@@ -167,5 +164,4 @@
groupMapper.selectPage(pageData, queryWrapper);
return pageData;
}
-
}
--
Gitblit v1.8.0