diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java index e08d21217..7fefe6371 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonAsyncServiceImpl.java @@ -18,7 +18,6 @@ import com.microservices.pms.enums.ProjectIssueStatus; import com.microservices.pms.product.domain.PmsProductRequirement; import com.microservices.pms.product.service.IPmsProductRequirementService; import com.microservices.pms.project.domain.*; -import com.microservices.pms.project.domain.vo.PmsProjectInputVo; import com.microservices.pms.project.domain.vo.PmsProjectIssuesInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestReportInputVo; import com.microservices.pms.project.domain.vo.PmsProjectTestsheetCaseInputVo; @@ -66,6 +65,9 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { private IPmsEnterpriseService pmsEnterpriseService; @Resource private PmsProjectMapper pmsProjectMapper; + + @Autowired + private IPmsProjectMembersService pmsProjectMembersService; @Resource private PmsProjectSprintMapper pmsProjectSprintMapper; @Autowired @@ -83,9 +85,7 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { @Autowired @Lazy private IPmsProductRequirementService pmsProductRequirementService; - @Autowired - @Lazy - private IPmsProjectService pmsProjectService; + private static final String INITIALIZE_NAME = "【示例%s】研发示例%s"; @@ -427,13 +427,18 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService { } private Long initializePmsProject(Long id, Long creatorGitLinkUserId) { - // 创建项目 - PmsProjectInputVo pmsProjectInputVo = new PmsProjectInputVo(); - pmsProjectInputVo.setPmsEnterpriseId(id); + PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(id); + PmsProject pmsProject = new PmsProject(); + pmsProject.setPmsEnterpriseId(id); String name = "项目"; - pmsProjectInputVo.setProjectName(String.format(INITIALIZE_NAME, name, name)); - pmsProjectInputVo.setProjectAssigneeId(creatorGitLinkUserId); - pmsProjectInputVo.setPmsProjectMemberIds(String.valueOf(creatorGitLinkUserId)); - return (long) pmsProjectService.insertPmsProject(pmsProjectInputVo); + pmsProject.setProjectName(String.format(INITIALIZE_NAME, name, name)); + pmsProject.setProjectAssigneeId(creatorGitLinkUserId); + pmsProject.setDeptId(pmsEnterprise.getDeptId()); + pmsProjectMapper.insertPmsProject(pmsProject); + PmsProjectMembers pmsProjectMembers = new PmsProjectMembers(); + pmsProjectMembers.setPmsProjectMemberId(creatorGitLinkUserId); + pmsProjectMembers.setPmsProjectId(pmsProject.getId()); + pmsProjectMembersService.insertPmsProjectMembers(pmsProjectMembers); + return pmsProject.getId(); } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java index 0675b39a9..21f6bdf4e 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectMembersServiceImpl.java @@ -111,7 +111,9 @@ public class PmsProjectMembersServiceImpl implements IPmsProjectMembersService public int insertPmsProjectMembers(PmsProjectMembers pmsProjectMembers) { SimpleSysUser user = pmsCommonService.getSimpleSysUserByGitlinkUserId(pmsProjectMembers.getPmsProjectMemberId()); - pmsProjectMembers.setUserId(user.getUserId()); + if (user != null) { + pmsProjectMembers.setUserId(user.getUserId()); + } pmsProjectService.selectAndCheckPmsProjectById(pmsProjectMembers.getPmsProjectId()); boolean exist = pmsProjectMembersMapper.countPmsProjectMembersByProjectIdAndMemberId( pmsProjectMembers.getPmsProjectId(),