From 275f338495f3e694ccf6fa909fb78b949a67921c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 13:06:20 +0800
Subject: [PATCH] screen-manage 修改前台用户模块
---
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 70 insertions(+), 32 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 cce9d52..0c42135 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
@@ -152,36 +152,6 @@
@Override
@Transactional
- public UserDTO deleteUser(UserDeleteForm form) {
- //������������������
- UserDTO dto = new UserDTO();
- //������
- Integer id = form.getId();
- //������������������������ ������������������
- User oldUser = new User();
- oldUser.setIsDelete(Constants.NOT_DELETE);
- oldUser.setId(id);
- QueryWrapper<User> oldWrapper = new QueryWrapper<>();
- oldWrapper.setEntity(oldUser);
- oldUser = userMapper.selectOne(oldWrapper);
- if(ObjectUtils.isEmpty(oldUser)){
- dto.setCode(ResponseCodeEnum.USER_NOT_EXIST.getCode());
- dto.setMsg(ResponseCodeEnum.USER_NOT_EXIST.getMsg());
- return dto;
- }
- //������������������������������������������������������������
- UpdateWrapper<User> deleteWrapper = new UpdateWrapper<>();
- deleteWrapper.eq("organization_id",oldUser.getOrganizationId());
- deleteWrapper.set("is_delete",Constants.DELETE);
- userMapper.update(null,deleteWrapper);
- //������������
- dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
- dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- return dto;
- }
-
- @Override
- @Transactional
public UserDTO insertUser(UserInsertForm form) {
//������������������
UserDTO dto = new UserDTO();
@@ -194,7 +164,7 @@
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.setEntity(existUser);
User existUserResult = userMapper.selectOne(wrapper);
- if(!ObjectUtils.isEmpty(existUserResult)){
+ if (!ObjectUtils.isEmpty(existUserResult)) {
dto.setCode(ResponseCodeEnum.USER_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.USER_EXIST.getMsg());
return dto;
@@ -208,18 +178,86 @@
QueryWrapper<User> organizationUserWrapper = new QueryWrapper<>();
organizationUserWrapper.setEntity(organizationUser);
organizationUser = userMapper.selectOne(organizationUserWrapper);
- if(!ObjectUtils.isEmpty(organizationUser)){
+ if (!ObjectUtils.isEmpty(organizationUser)) {
dto.setCode(ResponseCodeEnum.ORGANIZATION_USER_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.ORGANIZATION_USER_EXIST.getMsg());
return dto;
}
//������
userMapper.insert(user);
+ //������������
+ Organization organization = new Organization();
+ organization.setAdminUserId(user.getId());
+ organization.setId(organizationId);
+ organizationMapper.updateById(organization);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
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) {
+ //������������������
+ 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);
+ //������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
+
}
--
Gitblit v1.8.0