From 09f34122894caa567dd823ac401d7c028b1b441a Mon Sep 17 00:00:00 2001 From: zcl <9928619+zhangcl1991@user.noreply.gitee.com> Date: Thu, 3 Aug 2023 04:58:18 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20liteflow-core/src/main/java/com/yo?= =?UTF-8?q?mahub/liteflow/flow/element/condition/SwitchCondition.java.=20S?= =?UTF-8?q?witchCondition=E8=8A=82=E7=82=B9=E8=8B=A5=E5=9C=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E6=9C=AA=E8=AE=BE=E7=BD=AEid=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=20executable.getId()=20=E4=B8=BAnul?= =?UTF-8?q?l=EF=BC=8C=E4=BB=8E=E8=80=8C=E6=8A=A5NPE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zcl <9928619+zhangcl1991@user.noreply.gitee.com> --- .../liteflow/flow/element/condition/SwitchCondition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 66883cd79..a7d2ec7c8 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 @@ -64,7 +64,7 @@ public class SwitchCondition extends Condition { } else { targetExecutor = targetList.stream() - .filter(executable -> executable.getId().equals(targetId)) + .filter(executable -> ObjectUtil.equal(executable.getId(),targetId) ) .findFirst() .orElse(null); } From cf93cd43aa48518dc8298a50b2dbfe40f2e73892 Mon Sep 17 00:00:00 2001 From: zcl <9928619+zhangcl1991@user.noreply.gitee.com> Date: Thu, 3 Aug 2023 05:10:09 +0000 Subject: [PATCH 2/2] =?UTF-8?q?update=20liteflow-core/src/main/java/com/yo?= =?UTF-8?q?mahub/liteflow/flow/element/condition/SwitchCondition.java.=20N?= =?UTF-8?q?PE=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zcl <9928619+zhangcl1991@user.noreply.gitee.com> --- .../liteflow/flow/element/condition/SwitchCondition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a7d2ec7c8..2a208d8ee 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 @@ -57,7 +57,7 @@ public class SwitchCondition extends Condition { String _targetId = target[0]; String _targetTag = target[1]; targetExecutor = targetList.stream().filter(executable -> { - return (StrUtil.startWith(_targetId, TAG_PREFIX) && _targetTag.equals(executable.getTag())) + return (StrUtil.startWith(_targetId, TAG_PREFIX) && ObjectUtil.equal(_targetTag,executable.getTag())) || ((StrUtil.isEmpty(_targetId) || _targetId.equals(executable.getId())) && (StrUtil.isEmpty(_targetTag) || _targetTag.equals(executable.getTag()))); }).findFirst().orElse(null);