From e8487aed64c1012586f42de79b4df8a1550858de Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Thu, 22 Aug 2024 11:26:04 +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?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PmsCommonAsyncServiceImpl.java        | 18 ++++++++++--------
 .../service/impl/PmsProjectServiceImpl.java    |  4 ++--
 2 files changed, 12 insertions(+), 10 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 61d9448b0..4f905b782 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,6 +18,7 @@ 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;
@@ -82,6 +83,9 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService {
     @Autowired
     @Lazy
     private IPmsProductRequirementService pmsProductRequirementService;
+    @Autowired
+    @Lazy
+    private IPmsProjectService pmsProjectService;
 
     private static final String INITIALIZE_NAME = "【示例%s】研发示例%s";
 
@@ -423,14 +427,12 @@ public class PmsCommonAsyncServiceImpl implements IPmsCommonAsyncService {
     }
 
     private Long initializePmsProject(Long id, Long creatorGitLinkUserId) {
-        PmsEnterprise pmsEnterprise = pmsEnterpriseService.selectPmsEnterpriseById(id);
-        PmsProject pmsProject = new PmsProject();
-        pmsProject.setPmsEnterpriseId(id);
+        // 创建项目
+        PmsProjectInputVo pmsProjectInputVo = new PmsProjectInputVo();
+        pmsProjectInputVo.setPmsEnterpriseId(id);
         String name = "项目";
-        pmsProject.setProjectName(String.format(INITIALIZE_NAME, name, name));
-        pmsProject.setProjectAssigneeId(creatorGitLinkUserId);
-        pmsProject.setDeptId(pmsEnterprise.getDeptId());
-        pmsProjectMapper.insertPmsProject(pmsProject);
-        return pmsProject.getId();
+        pmsProjectInputVo.setProjectName(String.format(INITIALIZE_NAME, name, name));
+        pmsProjectInputVo.setProjectAssigneeId(creatorGitLinkUserId);
+        return (long) pmsProjectService.insertPmsProject(pmsProjectInputVo);
     }
 }
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
index 4f3b897c2..73d639445 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
@@ -183,7 +183,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService
         }
         PmsProject pmsProject = pmsProjectInputVo.toPmsProject();
         pmsProject.setDeptId(pmsEnterprise.getDeptId());
-        int count = pmsProjectMapper.insertPmsProject(pmsProject);
+        pmsProjectMapper.insertPmsProject(pmsProject);
         //同步新增项目-仓库数据
         if (StringUtils.isNotEmpty(pmsProjectInputVo.getProjectRepositoryIds())) {
             List<String> repositoryIdList = Arrays.asList(pmsProjectInputVo.getProjectRepositoryIds().split(","));
@@ -220,7 +220,7 @@ public class PmsProjectServiceImpl implements IPmsProjectService
                 }
             }
         }
-        return count;
+        return pmsProject.getId().intValue();
     }
 
     /**