From 0b779387dabedfd746a98cb4633189ac879a1471 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 27 Jul 2023 10:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=92=8C=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index 3826cb4..bf0d4c0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -276,9 +276,8 @@ public class ProjectLibManage {
                     ? Boolean.TRUE : Boolean.FALSE;
             //采取批量删除 批量添加的方式
             projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class)
-                    .eq(ProjectApplication::getProjectId,project.getId()));
-            projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class)
-                    .eq(ProjectApplication::getProjectCode,project.getProjectCode()));
+                    .eq(ProjectApplication::getProjectCode,project.getProjectCode())
+                    .eq(ProjectApplication::getProjectVersion,project.getVersion()));
             if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) {
                 Project finalProject = project;
                 List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> {
@@ -289,6 +288,7 @@ public class ProjectLibManage {
                     projectApplication.setProjectCode(finalProject.getProjectCode());
                     projectApplication.setBuildOrgCode(finalProject.getBuildOrgCode());
                     projectApplication.setBuildOrgName(finalProject.getBuildOrgName());
+                    projectApplication.setProjectVersion(finalProject.getVersion());
                     return projectApplication;
                 }).collect(Collectors.toList());
                 projectApplicationService.saveOrUpdateBatch(applications);
@@ -402,9 +402,8 @@ public class ProjectLibManage {
                     ? Boolean.TRUE : Boolean.FALSE;
             //采取批量删除 批量添加的方式
             projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class)
-                    .eq(ProjectApplication::getProjectId,project.getId()));
-            projectApplicationService.remove(Wrappers.lambdaQuery(ProjectApplication.class)
-                    .eq(ProjectApplication::getProjectCode,project.getProjectCode()));
+                    .eq(ProjectApplication::getProjectCode,project.getProjectCode())
+                    .eq(ProjectApplication::getProjectVersion,project.getVersion()));
             if (isApp && CollUtil.isNotEmpty(projectDto.getApplicationList())) {
                 Project finalProject = project;
                 List<ProjectApplication> applications = projectDto.getApplicationList().stream().map(application -> {
@@ -413,6 +412,7 @@ public class ProjectLibManage {
                     projectApplication.setId(null);
                     projectApplication.setProjectId(finalProject.getId());
                     projectApplication.setProjectCode(finalProject.getProjectCode());
+                    projectApplication.setProjectVersion(finalProject.getVersion());
                     return projectApplication;
                 }).collect(Collectors.toList());
                 projectApplicationService.saveOrUpdateBatch(applications);