From c94c642b38715b5a8a6cc23627ac422fdd440ff0 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 8 Sep 2023 17:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E5=BC=82=E6=AD=A5=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/gov/manage/GovProjectCollectionManage.java           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 33d27e7..bb8ce3b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -387,10 +387,6 @@ public class GovProjectCollectionManage {
         String baseProjId = base.getBaseProjId();
         String baseAreaCode = user.getRegionCode() + BizConst.NINE_AREA_CODE_LAST;
         String baseProjName = base.getBaseProjName();
-        //如果是新增的话 要生成 项目编号
-        if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){
-            baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO);
-        }
 
         //1.保存基本信息
         GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo();
@@ -418,6 +414,12 @@ public class GovProjectCollectionManage {
         saveBase.setBizTime(LocalDateTime.now());
         saveBase.setUpdateBy(user.getUsername());
         saveBase.setUpdateOn(LocalDateTime.now());
+
+        //如果是新增的话 要生成 项目编号
+        if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){
+            baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO);
+        }
+
         baseinfoService.saveOrUpdate(saveBase);
 
         // 2.保存 申报信息