修复上下文变量没有正常传递

flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/helper/MapHelper.java

@@ -2,6 +2,7 @@ package com.lanyuanxiaoyao.flowable.core.helper;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import lombok.NoArgsConstructor;
 
 /**
@@ -27,4 +28,19 @@ public class MapHelper {
   public static Map<String, Object> empty() {
     return new HashMap<>(0);
   }
+
+  public static boolean isEmpty(Map<?, ?> map) {
+    return Objects.isNull(map) || map.isEmpty();
+  }
+
+  @SafeVarargs
+  public static <K, V> Map<K, V> concat(Map<K, V>... maps) {
+    Map<K, V> result = new HashMap<>();
+    for (Map<K, V> map : maps) {
+      if (Objects.nonNull(map)) {
+        result.putAll(map);
+      }
+    }
+    return result;
+  }
 }

flowable-core/src/main/java/com/lanyuanxiaoyao/flowable/core/manager/FlowableManager.java

@@ -107,6 +107,7 @@ public abstract class FlowableManager {
   private void manualAction(String instanceId, FlowableAction action, String comment, Map<String, Object> metadata) {
     FlowableInstance instance = repository.getInstance(instanceId);
     FlowableNode node = repository.getNode(instance.getCurrentNodeId());
+    metadata = MapHelper.isEmpty(metadata) ? instance.getMetadata() : MapHelper.concat(metadata, instance.getMetadata());
     action(instance, node, action, comment, metadata);
   }