From ce070cde1ea1d74f470199807e2d16d34161f22b Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Mon, 12 Jun 2023 22:12:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=20#I7CCAB=20CatchCondition=E4=BC=9A?=
 =?UTF-8?q?=E6=8A=8AChainEndException=E4=B9=9F=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liteflow/flow/element/condition/CatchCondition.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/CatchCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/CatchCondition.java
index 690d47e1..a2e327ea 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/CatchCondition.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/CatchCondition.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.enums.ConditionTypeEnum;
 import com.yomahub.liteflow.exception.CatchErrorException;
+import com.yomahub.liteflow.exception.ChainEndException;
 import com.yomahub.liteflow.flow.element.Condition;
 import com.yomahub.liteflow.flow.element.Executable;
 import com.yomahub.liteflow.slot.DataBus;
@@ -28,8 +29,10 @@ public class CatchCondition extends Condition {
 			}
 			catchExecutable.setCurrChainId(this.getCurrChainId());
 			catchExecutable.execute(slotIndex);
-		}
-		catch (Exception e) {
+		}catch (ChainEndException e){
+			//ChainEndException属于用户主动结束流程，不应该进入Catch的流程
+			throw e;
+		}catch (Exception e) {
 			Executable doExecutable = this.getDoItem();
 			if (ObjectUtil.isNotNull(doExecutable)) {
 				doExecutable.setCurrChainId(this.getCurrChainId());