From c24d05472b0feb6917c69749e564374567e143db Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 24 Jan 2024 09:46:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B):=2081019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fb/service/impl/ProcessFbEntryChangeServiceImpl.java       | 1 +
 .../service/impl/ProcessFbStandardConsultationServiceImpl.java | 1 +
 .../fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java  | 1 +
 .../com/jero/modules/activiti/service/ProcessAllService.java   | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index dd284272..e9b94e75 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -189,6 +189,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         // 保存草稿用于强制撤销
         processInfoVO.setSaveSource("3");
         processInfoVO.getBasicTaskInfoDTO().setTaskId(null);
+        processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null);
         saveToDraft(processInfoVO);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index 798b8439..167e1109 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -139,6 +139,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         // 保存草稿用于强制撤销
         processInfoVO.setSaveSource("3");
         processInfoVO.getBasicTaskInfoDTO().setTaskId(null);
+        processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null);
         saveToDraft(processInfoVO);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
index c2caaba9..d66614fe 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
@@ -95,6 +95,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
         // 保存草稿用于强制撤销
         processInfoVO.setSaveSource("3");
         processInfoVO.getBasicTaskInfoDTO().setTaskId(null);
+        processInfoVO.getBasicProcessInfoDTO().setProcessInstanceId(null);
         saveToDraft(processInfoVO);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index e46c21a1..964091ef 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -70,6 +70,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
     private ProcessDraftService processDraftService;
 
     private static final List<Integer> INSPECT_PROCESS = Arrays.asList(
+            ProcessTypeEnum.FB_ENTRY_CHANGE.getValue(),
+            ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue(),
+            ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue(),
             ProcessTypeEnum.ES_INSPECT_PLAN.getValue(),
             ProcessTypeEnum.ES_INSPECT.getValue(),
             ProcessTypeEnum.ES_INSPECT_DELAY_APPLY.getValue(),