From d2f7c39428bc49382353c419d799cc27d0a8092f Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Thu, 22 Aug 2024 15:14:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE):=20#5402=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=B0=86=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PmsCommonAsyncServiceImpl.java       | 27 +++++++++++--------
 .../impl/PmsProjectMembersServiceImpl.java    |  4 ++-
 2 files changed, 19 insertions(+), 12 deletions(-)

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