From 349c49d9c6407dbfc46a33f9795647a71406dd0d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 21 May 2021 10:18:01 +0800
Subject: [PATCH] screen-manage 修改型号查询BUG，修改sql语句，改为左外连
---
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 67 ++++++++++++---------------------
1 files changed, 24 insertions(+), 43 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 7076c71..fe313f3 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
@@ -217,55 +217,37 @@
@Override
@Transactional
public UserDTO deleteUser(UserDeleteForm form) {
+ //������������������
+ UserDTO dto = new UserDTO();
//������
Integer id = form.getId();
//������������������
User user = new User();
- user.setIsDelete(Constants.NOT_DELETE);
+ user.setIsDelete(Constants.DELETE);
user.setId(id);
- //������������������
- UserDTO dto = deleteUserModel(user);
+ //������������
+ userMapper.updateById(user);
+ //������user_group
+ UpdateWrapper deleteUserGroupWrapper = new UpdateWrapper();
+ deleteUserGroupWrapper.eq("user_id", id);
+ deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
+ userGroupMapper.update(null, deleteUserGroupWrapper);
//���������������admin������������
UpdateWrapper updateOrgWrapper = new UpdateWrapper();
- updateOrgWrapper.eq("admin_user_id",user.getId());
- updateOrgWrapper.set("admin_user_id",0);
- organizationMapper.update(null,updateOrgWrapper);
+ updateOrgWrapper.eq("admin_user_id", user.getId());
+ updateOrgWrapper.set("admin_user_id", 0);
+ organizationMapper.update(null, updateOrgWrapper);
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
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);
@@ -273,24 +255,23 @@
userMapper.update(null, deleteUserChildrenWrapper);
//���������������groupMenu
UpdateWrapper deleteGroupMenuWrapper = new UpdateWrapper();
- deleteGroupMenuWrapper.eq("organization_id",organizationId);
+ deleteGroupMenuWrapper.eq("organization_id", organizationId);
deleteGroupMenuWrapper.set("is_delete", Constants.DELETE);
- groupMenuMapper.update(null,deleteGroupMenuWrapper);
+ groupMenuMapper.update(null, deleteGroupMenuWrapper);
//���������������userGroup
UpdateWrapper deleteUserGroupWrapper = new UpdateWrapper();
- deleteUserGroupWrapper.eq("organization_id",organizationId);
+ deleteUserGroupWrapper.eq("organization_id", organizationId);
deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
- userGroupMapper.update(null,deleteUserGroupWrapper);
- //���������������groupMenu
+ userGroupMapper.update(null, deleteUserGroupWrapper);
+ //���������������group
UpdateWrapper deleteGroupWrapper = new UpdateWrapper();
- deleteGroupWrapper.eq("organization_id",organizationId);
+ deleteGroupWrapper.eq("organization_id", organizationId);
deleteGroupWrapper.set("is_delete", Constants.DELETE);
- groupMapper.update(null,deleteGroupWrapper);
+ groupMapper.update(null, deleteGroupWrapper);
//������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
}
--
Gitblit v1.8.0