fix process instance global param not include to task instance when m…

…aster executing
apache · Apr 24, 2022 · faf7de5 · faf7de5
1 parent 3e85194
commit faf7de5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/...service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -27,6 +27,8 @@
 import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
 import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
 import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
+import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR;
+import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN;
 import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConstants.TASK_INSTANCE_ID;
 
 import org.apache.dolphinscheduler.common.Constants;
@@ -801,14 +803,22 @@ private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<
         }
         startParamMap.putAll(fatherParamMap);
         // set start param into global params
+        Map<String, String> globalMap = processDefinition.getGlobalParamMap();
+        List<Property> globalParamList = processDefinition.getGlobalParamList();
         if (startParamMap.size() > 0
-            && processDefinition.getGlobalParamMap() != null) {
-            for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) {
+            && globalMap != null) {
+            for (Map.Entry<String, String> param : globalMap.entrySet()) {
                 String val = startParamMap.get(param.getKey());
                 if (val != null) {
                     param.setValue(val);
                 }
             }
+            for (Entry<String, String> startParam : startParamMap.entrySet()) {
+                if (!globalMap.containsKey(startParam.getKey())) {
+                    globalMap.put(startParam.getKey(), startParam.getValue());
+                    globalParamList.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue()));
+                }
+            }
         }
     }