screen-manage 修改组织模块Bug

kaiyu

2021-05-11 0e48cd386385110ea16ca05aae070f013c221f9a

 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());