From 196c172048a618a4eeae9a89ee8975d5a699526a Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sat, 19 Nov 2022 11:32:10 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5ULVA=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B8=8D=E8=A7=84=E8=8C=83=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?chain=E7=9A=84name=E5=92=8Cid=E6=B7=B7=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=A4=AA=E4=B8=A5=E8=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/flow/element/condition/SwitchCondition.java | 2 +- .../yomahub/liteflow/script/groovy/GroovyScriptExecutor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); }