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 | 28 ----------------------------
1 files changed, 0 insertions(+), 28 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 fe313f3..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
@@ -214,34 +214,6 @@
return dto;
}
- @Override
- @Transactional
- public UserDTO deleteUser(UserDeleteForm form) {
- //������������������
- UserDTO dto = new UserDTO();
- //������
- Integer id = form.getId();
- //������������������
- User user = new User();
- user.setIsDelete(Constants.DELETE);
- user.setId(id);
- //������������
- 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);
- //������������������
- dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
- dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- return dto;
- }
@Override
@Transactional
--
Gitblit v1.8.0