From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 88 ++++++++++++++++++-------------------------
1 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 0c42135..054185d 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -5,10 +5,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.entity.Group;
import com.moral.api.entity.Organization;
import com.moral.api.entity.User;
-import com.moral.api.mapper.OrganizationMapper;
-import com.moral.api.mapper.UserMapper;
+import com.moral.api.entity.UserGroup;
+import com.moral.api.mapper.*;
import com.moral.api.pojo.dto.user.UserDTO;
import com.moral.api.pojo.dto.user.UserQueryDTO;
import com.moral.api.pojo.form.user.UserDeleteForm;
@@ -44,6 +45,12 @@
UserMapper userMapper;
@Autowired
OrganizationMapper organizationMapper;
+ @Autowired
+ GroupMapper groupMapper;
+ @Autowired
+ UserGroupMapper userGroupMapper;
+ @Autowired
+ GroupMenuMapper groupMenuMapper;
@Override
public UserQueryDTO queryUsers(UserQueryForm form) {
@@ -183,8 +190,19 @@
dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_EXIST.getMsg());
return dto;
}
- //������
+ //���������������
userMapper.insert(user);
+ //������������admin������
+ Group group = new Group();
+ group.setOrganizationId(organizationId);
+ group.setGroupName("admin");
+ groupMapper.insert(group);
+ //���������������������������
+ UserGroup userGroup = new UserGroup();
+ userGroup.setUserId(user.getId());
+ userGroup.setGroupId(group.getId());
+ userGroup.setOrganizationId(organizationId);
+ userGroupMapper.insert(userGroup);
//������������
Organization organization = new Organization();
organization.setAdminUserId(user.getId());
@@ -196,68 +214,36 @@
return dto;
}
- @Override
- @Transactional
- public UserDTO deleteUser(UserDeleteForm form) {
- //������
- Integer id = form.getId();
- //������������������
- User user = new User();
- user.setIsDelete(Constants.NOT_DELETE);
- user.setId(id);
- //������������������
- UserDTO dto = deleteUserModel(user);
- //���������������admin������������
- UpdateWrapper updateOrgWrapper = new UpdateWrapper();
- updateOrgWrapper.eq("admin_user_id",user.getId());
- updateOrgWrapper.set("admin_user_id",0);
- organizationMapper.update(null,updateOrgWrapper);
- return dto;
- }
@Override
@Transactional
- public UserDTO deleteUserByOrganizationId(Integer organizationId) {
- //������������������
- User user = new User();
- user.setOrganizationId(organizationId);
- //������������������
- UserDTO dto = deleteUserModel(user);
- return dto;
- }
-
-
- private UserDTO deleteUserModel(User user) {
+ public UserDTO deleteUsersByOrganizationId(Integer organizationId) {
//������������������
UserDTO dto = new UserDTO();
- //������������
- Integer organizationId = null;
- //������������������������������������������������
- User oldUser = null;
- //������������������������������id
- if (ObjectUtils.isEmpty(user.getOrganizationId())) {
- QueryWrapper<User> deleteUserWrapper = new QueryWrapper<>();
- deleteUserWrapper.setEntity(user);
- oldUser = userMapper.selectOne(deleteUserWrapper);
- if (ObjectUtils.isEmpty(user)) {
- dto.setCode(ResponseCodeEnum.USER_NOT_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.USER_NOT_EXIST.getMsg());
- return dto;
- }
- organizationId = oldUser.getOrganizationId();
- }else{
- organizationId = user.getOrganizationId();
- }
//������������������������������������������������������������
UpdateWrapper<User> deleteUserChildrenWrapper = new UpdateWrapper<>();
deleteUserChildrenWrapper.eq("organization_id", organizationId);
deleteUserChildrenWrapper.set("is_delete", Constants.DELETE);
userMapper.update(null, deleteUserChildrenWrapper);
+ //���������������groupMenu
+ UpdateWrapper deleteGroupMenuWrapper = new UpdateWrapper();
+ deleteGroupMenuWrapper.eq("organization_id", organizationId);
+ deleteGroupMenuWrapper.set("is_delete", Constants.DELETE);
+ groupMenuMapper.update(null, deleteGroupMenuWrapper);
+ //���������������userGroup
+ UpdateWrapper deleteUserGroupWrapper = new UpdateWrapper();
+ deleteUserGroupWrapper.eq("organization_id", organizationId);
+ deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
+ userGroupMapper.update(null, deleteUserGroupWrapper);
+ //���������������group
+ UpdateWrapper deleteGroupWrapper = new UpdateWrapper();
+ deleteGroupWrapper.eq("organization_id", organizationId);
+ deleteGroupWrapper.set("is_delete", Constants.DELETE);
+ groupMapper.update(null, deleteGroupWrapper);
//������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
}
--
Gitblit v1.8.0