public/liteFlow
1
0
Fork 0
mirror of https://gitee.com/dromara/liteFlow.git synced 2026-05-14 12:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug][I3CT49]连续的when标签，之间并不是完全并行的

Browse Source 
注释：连续node when标签同groupid 或者默认进行合并 并且报错进行标志 向下传递
3.CollectionUtil.getLast(conditionList)
This commit is contained in:
meng.li
2021-03-30 23:50:06 +08:00
parent d54790fbf9
commit 6d972f668f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java
View File

@@ -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())));
}