diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java index d5fbd273..d510da8d 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java @@ -89,7 +89,7 @@ public class SwitchCondition extends Condition{ } public void addTargetItem(Executable executable){ - this.targetMap.put(executable.getExecuteName(), executable); + this.targetMap.put(executable.getExecuteId(), executable); } public void setSwitchNode(Node switchNode) { diff --git a/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java b/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java index 0d1a4a92..a66ecd36 100644 --- a/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java +++ b/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java @@ -77,7 +77,7 @@ public class GroovyScriptExecutor implements ScriptExecutor { metaMap.put("requestData", slot.getRequestData()); //如果有隐式流程,则放入隐式流程的流程参数 - Object subRequestData = slot.getChainReqData(wrap.getCurrChainName()); + Object subRequestData = slot.getChainReqData(wrap.getCurrChainId()); if (ObjectUtil.isNotNull(subRequestData)){ metaMap.put("subRequestData", subRequestData); }