From 0dabb74f290fbf8bfddd67f3d9fd863804c3439c Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 10 Aug 2023 11:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8D=E6=80=A5=E7=9D=80?=
 =?UTF-8?q?=20id=20=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
index 726d292..5ea60b7 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
@@ -149,7 +149,6 @@ public class AnnualPlanLibManage {
         Project oldProject = projectService.getById(req.getProjectId());
         Project project = BeanUtil.copyProperties(oldProject, Project.class);
         // 被撤回重新申报的项目,项目ID要置空
-        project.setId(null);
         project.setCreateOn(LocalDateTime.now());
         project.setUpdateOn(LocalDateTime.now());
         stateMachine.pass(project);
@@ -167,6 +166,7 @@ public class AnnualPlanLibManage {
         project.setProjectCode(oldProject.getProjectCode());
         project.setVersion(oldProject.getVersion() + 1);
         project.setInstCode(TodoCenterConstant.Declared.NULL_INST_CODE);
+        project.setId(null);
         if(projectService.save(project)){
             applicationService.saveApplication(project,oldProject,Boolean.TRUE);
             // 将旧的项目版本置为不是最新