From 988af25c462543ab1bc614159868d82f9ba52e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 16 Jul 2024 11:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B=E3=80=81=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessMarketStandardReleaseServiceImpl.java    | 13 +++++++++++--
 .../impl/ProcessNewStandardImportServiceImpl.java   |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index ae9f35c4..4536b845 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -35,6 +35,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.DelegationState;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -144,12 +145,20 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void saveToDraft(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
-        // 验证是否已发起流程
-        checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
+        BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO();
+        if(Objects.isNull(basicTaskInfoDTO) || StringUtils.isBlank(basicTaskInfoDTO.getTaskId())){
+            // 验证是否已发起流程
+            checkProcessStatus(processInfoVO.getBusinessInfoDTO().getManifestId());
+        }
+        ProcessMarketStandardRelease processMarketStandardRelease =  processInfoVO.getBusinessInfoDTO();
+        if(!Objects.isNull(processMarketStandardRelease)){
+            saveOrUpdate(processMarketStandardRelease);
+        }
         // 流程信息
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         // 流程类型
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.MARKET_STANDARD_PUBLISH.getValue());
+
         processHandleService.saveToDraft(processInfoVO, UserUtils.getUserId());
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
index 7fdc4846..8fb212b1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
@@ -141,6 +141,10 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
     @Override
     @Transactional(rollbackFor = JeroBootException.class)
     public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
+        ProcessNewStandardImport processNewStandardImport = processInfoVO.getBusinessInfoDTO();
+        if(!Objects.isNull(processNewStandardImport)){
+            saveOrUpdate(processNewStandardImport);
+        }
         // 流程信息
         BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
         // 流程类型