From 6d972f668f76ecad2161d3df6bcaee40ac3e57de Mon Sep 17 00:00:00 2001 From: "meng.li" Date: Tue, 30 Mar 2021 23:50:06 +0800 Subject: [PATCH] =?UTF-8?q?[bug][I3CT49]=E8=BF=9E=E7=BB=AD=E7=9A=84when?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=B9=8B=E9=97=B4=E5=B9=B6=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E5=AE=8C=E5=85=A8=E5=B9=B6=E8=A1=8C=E7=9A=84=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=9A=E8=BF=9E=E7=BB=ADnode=20when?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=90=8Cgroupid=20=E6=88=96=E8=80=85?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=9B=E8=A1=8C=E5=90=88=E5=B9=B6=20?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=8A=A5=E9=94=99=E8=BF=9B=E8=A1=8C=E6=A0=87?= =?UTF-8?q?=E5=BF=97=20=E5=90=91=E4=B8=8B=E4=BC=A0=E9=80=92=203.Collection?= =?UTF-8?q?Util.getLast(conditionList)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yomahub/liteflow/parser/XmlFlowParser.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java index 8db8df72e..bd73bafcc 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java @@ -7,6 +7,7 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.common.LocalDefaultFlowConent; import com.yomahub.liteflow.entity.flow.*; @@ -151,16 +152,16 @@ public abstract class XmlFlowParser { if (condE.getName().equals("then")) { if(conditionList.size() > 1 && - conditionList.get(conditionList.size() - 1) instanceof ThenCondition ){ - conditionList.get(conditionList.size() - 1).getNodeList().addAll(chainNodeList); + CollectionUtil.getLast(conditionList) instanceof ThenCondition ){ + CollectionUtil.getLast(conditionList).getNodeList().addAll(chainNodeList); }else{ conditionList.add(new ThenCondition(chainNodeList)); } } else if (condE.getName().equals("when")) { if(conditionList.size() > 1 && - conditionList.get(conditionList.size() - 1) instanceof WhenCondition && - conditionList.get(conditionList.size() - 1).getGroupId().equals(group)){ - conditionList.get(conditionList.size() - 1).getNodeList().addAll(chainNodeList); + CollectionUtil.getLast(conditionList) instanceof WhenCondition && + CollectionUtil.getLast(conditionList).getGroupId().equals(group)){ + CollectionUtil.getLast(conditionList).getNodeList().addAll(chainNodeList); }else{ conditionList.add(new WhenCondition(chainNodeList, errorResume.equals(Boolean.TRUE.toString()))); }