Browse Source

bug memberposition

master
zhizhi wu 4 years ago
parent
commit
68339ff6b4
  1. 30
      src/main/java/com/ccsens/carbasics/service/AsyncService.java
  2. 4
      src/main/resources/application.yml

30
src/main/java/com/ccsens/carbasics/service/AsyncService.java

@ -4,14 +4,12 @@ import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.carbasics.bean.dto.ProjectDto;
import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
import com.ccsens.carbasics.bean.po.Organization;
import com.ccsens.carbasics.bean.po.OrganizationDepartment;
import com.ccsens.carbasics.bean.po.OrganizationMember;
import com.ccsens.carbasics.bean.po.OrganizationProject;
import com.ccsens.carbasics.bean.po.*;
import com.ccsens.carbasics.persist.dao.OrganizationDao;
import com.ccsens.carbasics.persist.dao.OrganizationDepartmentDao;
import com.ccsens.carbasics.persist.dao.OrganizationMemberDao;
import com.ccsens.carbasics.persist.dao.OrganizationProjectDao;
import com.ccsens.carbasics.persist.mapper.OrganizationMemberPositionMapper;
import com.ccsens.carbasics.util.Constant;
import com.ccsens.common.bean.dto.CMemberDto;
import com.ccsens.common.bean.dto.CProjectDto;
@ -57,6 +55,9 @@ public class AsyncService implements IAsyncService {
private IMemberService memberService;
@Resource
private OrganizationProjectDao organizationProjectDao;
@Resource
private OrganizationMemberPositionMapper organizationMemberPositionMapper;
@Resource
private RedisUtil redisUtil;
@ -104,9 +105,12 @@ public class AsyncService implements IAsyncService {
member.setUserId(userId);
member.setName(param.getName());
member.setContact(param.getPhone());
member.setPositionId(2L);
member.setDepartmentId(department.getId());
organizationMemberDao.insertSelective(member);
OrganizationMemberPosition position = new OrganizationMemberPosition();
position.setId(snowflake.nextId());
position.setPositionId(2L);
position.setDepartmentId(department.getId());
organizationMemberPositionMapper.insertSelective(position);
//创建项目
createProject(newOrganization.getId(),param,userId);
@ -126,9 +130,12 @@ public class AsyncService implements IAsyncService {
member.setUserId(userId);
member.setName(param.getName());
member.setContact(param.getPhone());
member.setPositionId(2L);
member.setDepartmentId(newDepartment.getId());
organizationMemberDao.insertSelective(member);
OrganizationMemberPosition position = new OrganizationMemberPosition();
position.setId(snowflake.nextId());
position.setPositionId(2L);
position.setDepartmentId(department.getId());
organizationMemberPositionMapper.insertSelective(position);
//创建项目
createProject(organization.getId(),param,userId);
}else {
@ -137,9 +144,12 @@ public class AsyncService implements IAsyncService {
member.setUserId(userId);
member.setName(param.getName());
member.setContact(param.getPhone());
member.setPositionId(2L);
member.setDepartmentId(department.getId());
organizationMemberDao.insertSelective(member);
OrganizationMemberPosition position = new OrganizationMemberPosition();
position.setId(snowflake.nextId());
position.setPositionId(2L);
position.setDepartmentId(department.getId());
organizationMemberPositionMapper.insertSelective(position);
//创建项目
createProject(organization.getId(),param,userId);
}

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: dev
include: common, util-dev
active: prod
include: common, util-prod

Loading…
Cancel
Save