ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java

@@ -27,11 +27,6 @@ public class ProcessEvent implements Serializable {
      */
     private String flowCode;
 
-    /**
-     * 实例id
-     */
-    private Long instanceId;
-
     /**
      * 业务id
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java

@@ -47,11 +47,6 @@ public class ProcessTaskEvent implements Serializable {
      */
     private Long taskId;
 
-    /**
-     * 实例id
-     */
-    private Long instanceId;
-
     /**
      * 业务id
      */

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java

@@ -39,7 +39,6 @@ public class FlowProcessEventHandler {
         ProcessEvent processEvent = new ProcessEvent();
         processEvent.setTenantId(tenantId);
         processEvent.setFlowCode(flowCode);
-        processEvent.setInstanceId(instance.getId());
         processEvent.setBusinessId(instance.getBusinessId());
         processEvent.setNodeType(instance.getNodeType());
         processEvent.setNodeCode(instance.getNodeCode());
@@ -65,7 +64,6 @@ public class FlowProcessEventHandler {
         ProcessTaskEvent processTaskEvent = new ProcessTaskEvent();
         processTaskEvent.setTenantId(tenantId);
         processTaskEvent.setFlowCode(flowCode);
-        processTaskEvent.setInstanceId(instance.getId());
         processTaskEvent.setBusinessId(instance.getBusinessId());
         processTaskEvent.setNodeType(instance.getNodeType());
         processTaskEvent.setNodeCode(instance.getNodeCode());

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.dto.FlowParams;
 import org.dromara.warm.flow.core.entity.Definition;
 import org.dromara.warm.flow.core.entity.Instance;
@@ -15,6 +16,7 @@ import org.dromara.warm.flow.core.entity.Task;
 import org.dromara.warm.flow.core.listener.GlobalListener;
 import org.dromara.warm.flow.core.listener.ListenerVariable;
 import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.common.constant.FlowConstant;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
@@ -163,12 +165,15 @@ public class WorkflowGlobalListener implements GlobalListener {
                 flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
             }
         }
-        insService.removeVariables(instance.getId(),
-            FlowConstant.FLOW_COPY_LIST,
-            FlowConstant.MESSAGE_TYPE,
-            FlowConstant.MESSAGE_NOTICE,
-            FlowConstant.SUBMIT
-        );
+        FlowInstance ins = new FlowInstance();
+        Map<String, Object> variableMap = instance.getVariableMap();
+        variableMap.remove(FlowConstant.FLOW_COPY_LIST);
+        variableMap.remove(FlowConstant.MESSAGE_TYPE);
+        variableMap.remove(FlowConstant.MESSAGE_NOTICE);
+        variableMap.remove(FlowConstant.SUBMIT);
+        ins.setId(instance.getId());
+        ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
+        insService.updateById(ins);
     }
 
     /**