From 76b3e6ba8589b67586e3f4be8a473013e5b908c6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Feb 2024 19:14:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081260=20=E3=80=90=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E3=80=91=E9=9D=9E=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E4=BC=9A=E5=8F=98=E6=88=90=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java  | 19 +++++++++++++++++++
 .../impl/ProcessEsInitChangeServiceImpl.java  |  2 +-
 .../impl/ProcessEsRecheckServiceImpl.java     |  2 +-
 .../service/impl/EsRevisionServiceImpl.java   |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index b84a667f..e800a437 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -325,6 +325,25 @@ public class ActFlowCommonService {
      * @param dueTime
      */
     public void updateProcessAll(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) {
+        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
+        process.setPrcName(prcName);
+        process.setPrcMes(prcMes);
+        process.setDueTime(dueTime);
+        process.setPrcType(prcType);
+        processAllService.updateById(process);
+    }
+
+    /**
+     * 更新流程主表
+     *
+     * @param processInstanceId
+     * @param userId
+     * @param prcName
+     * @param prcMes
+     * @param prcType
+     * @param dueTime
+     */
+    public void updateProcessAllWithUserId(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) {
         ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
         process.setCreateUserId(userId);
         process.setPrcName(prcName);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index c8d3c54c..4ff5c791 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -246,7 +246,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
         // 根据流程实例id更新流程总表
         Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
-        actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
+        actFlowCommonService.updateProcessAllWithUserId(processInstanceId, mainDraftUser, prcName, null, prcType, null);
     }
 
     private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index 97e0216b..41107923 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -159,7 +159,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         String prcMes = common.getPrcMes();
         Date dueTime = common.getDueTime();
         Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+        actFlowCommonService.updateProcessAllWithUserId(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
     }
 
     public Map<String, Object> setVariables(Map<String, Object> flowUser) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 1aae4682..fc5fbe41 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -276,7 +276,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
         // 更新流程信息
-        actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
+        actFlowCommonService.updateProcessAllWithUserId(processInstanceId, mainDraftUser, prcName, null, prcType, null);
     }
 
     @Override