From 0e48cd386385110ea16ca05aae070f013c221f9a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 10:35:01 +0800
Subject: [PATCH] screen-manage 修改组织模块Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..3d9a977 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,9 +5,13 @@
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.entity.UserGroup;
+import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.dto.user.UserDTO;
import com.moral.api.pojo.dto.user.UserQueryDTO;
@@ -44,6 +48,10 @@
UserMapper userMapper;
@Autowired
OrganizationMapper organizationMapper;
+ @Autowired
+ GroupMapper groupMapper;
+ @Autowired
+ UserGroupMapper userGroupMapper;
@Override
public UserQueryDTO queryUsers(UserQueryForm form) {
@@ -183,8 +191,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());
--
Gitblit v1.8.0