From 6196701d53b72ce1aae25905ef6404065b3d2edd Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 13 May 2021 16:53:21 +0800
Subject: [PATCH] 因子、站点模糊查询
---
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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..7076c71 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());
@@ -253,6 +271,21 @@
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);
+ //���������������groupMenu
+ 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());
--
Gitblit v1.8.0