替换公共参数BUG

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowOperatingServiceImpl.java

@@ -115,13 +115,13 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
         //解析对应的版本依赖
         Set<NodeRelyDto> nodeRelyDtoSet = FlowNodeRelyParseUtil.parseThisVersionNodeRely(nodeByFlowIdAndVersionName, startNodeTaskName, allNodeDependencyKey, "1".equals(supplementStatus));
 
-        if (CollectionUtil.isNotEmpty(nodeRelyDtoSet) && CollectionUtil.isNotEmpty(paramCarrier)) {
+        if (CollectionUtil.isNotEmpty(nodeRelyDtoSet)) {
             //循环所有的结果集
             nodeRelyDtoSet.forEach(nodeWrapped -> {
                 Node node = nodeWrapped.getNode();
                 String nodeName = node.getNodeName();
                 //基于节点名称替换参数
-                String param = paramCarrier.get(nodeName);
+                String param = parseParam(paramCarrier,nodeName);
                 if (StringUtils.isNoneBlank(param)) {
                     //获取包装逻辑
                     RunParamWrapped runParamWrapped = new RunParamWrapped();
@@ -129,6 +129,15 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                     runParamWrapped.setPublicParamMap(publicParam);
                     //构建参数
                     node.setRunParam(JSON.toJSONString(runParamWrapped));
+                }else{
+                    String runParam = node.getRunParam();
+                    RunParamWrapped runParamWrapped = new RunParamWrapped();
+                    if(StringUtils.isNoneBlank(runParam)) {
+                        runParamWrapped = JSON.parseObject(runParam, RunParamWrapped.class);
+                    }
+                    runParamWrapped.setPublicParamMap(publicParam);
+                    //构建参数
+                    node.setRunParam(JSON.toJSONString(runParamWrapped));
                 }
             });
         }
@@ -153,6 +162,19 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
         return makeUpReturns;
     }
 
+    /**
+     * 解析参数
+     * @param paramCarrier 参数信息
+     * @param nodeName 节点名称
+     * @return
+     */
+    public String parseParam(Map<String, String> paramCarrier, String nodeName){
+        if(CollectionUtil.isNotEmpty(paramCarrier)){
+            return paramCarrier.get(nodeName);
+        }
+        return null;
+    }
+
     @Override
     public List<MakeUpReturn> routineSupplementBatch(RepairFlow repairFlow) {
         List<MakeUpReturn> makeUpReturns = new ArrayList<>(2);