From d54790fbf9e3098eb8971079b2aecde5a13980b6 Mon Sep 17 00:00:00 2001
From: "meng.li" <vans.li@thebeastshop.com>
Date: Tue, 30 Mar 2021 23:48:34 +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=201.groupId=20?=
 =?UTF-8?q?->=20group=202.errorResume=20->=20default=20true?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yomahub/liteflow/entity/flow/Condition.java    |  2 +-
 .../com/yomahub/liteflow/parser/XmlFlowParser.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Condition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Condition.java
index f1ce3984f..70b1cffc9 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Condition.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/entity/flow/Condition.java
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class Condition {
 	//	增加errorResume属性，以区分当when调用链调用失败时是否继续往下执行 默认true继续执行
-	private boolean errorResume;
+	private boolean errorResume = true;
 	// 增加groupId属性，用于不同node进行同组合并
 	private String groupId = LocalDefaultFlowConent.DEFAULT;
 
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 39e86e397..8db8df72e 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
@@ -93,7 +93,7 @@ public abstract class XmlFlowParser {
 	private void parseOneChain(Element e) throws Exception{
 		String condArrayStr;
 		String[] condArray;
-		String groupId;
+		String group;
 		String errorResume;
 		List<Executable> chainNodeList;
 		List<Condition> conditionList;
@@ -104,12 +104,12 @@ public abstract class XmlFlowParser {
 			Element condE = it.next();
 			condArrayStr = condE.attributeValue("value");
 			errorResume = e.attributeValue("errorResume");
-			groupId = e.attributeValue("groupId");
+			group = e.attributeValue("group");
 			if (StrUtil.isBlank(condArrayStr)) {
 				continue;
 			}
-			if (StrUtil.isBlank(groupId)) {
-				groupId = LocalDefaultFlowConent.DEFAULT;
+			if (StrUtil.isBlank(group)) {
+				group = LocalDefaultFlowConent.DEFAULT;
 			}
 			if (StrUtil.isBlank(errorResume)) {
 				errorResume = Boolean.TRUE.toString();
@@ -159,7 +159,7 @@ public abstract class XmlFlowParser {
 			} else if (condE.getName().equals("when")) {
 				if(conditionList.size() > 1 &&
 						conditionList.get(conditionList.size() - 1) instanceof WhenCondition &&
-						conditionList.get(conditionList.size() - 1).getGroupId().equals(groupId)){
+						conditionList.get(conditionList.size() - 1).getGroupId().equals(group)){
 					conditionList.get(conditionList.size() - 1).getNodeList().addAll(chainNodeList);
 				}else{
 					conditionList.add(new WhenCondition(chainNodeList, errorResume.equals(Boolean.TRUE.toString())));