From cbbeaa3813531583cba7fa9cbbd46d978f7e757e Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 21 Apr 2020 14:12:05 +0800 Subject: [PATCH] =?UTF-8?q?executor=20=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=BF=BD?= =?UTF-8?q?=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/rule/engine/model/SqlRuleModelParser.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/SqlRuleModelParser.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/SqlRuleModelParser.java index 190f39e5..900a539d 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/SqlRuleModelParser.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/SqlRuleModelParser.java @@ -10,6 +10,7 @@ import org.jetlinks.rule.engine.api.model.RuleNodeModel; import org.jetlinks.rule.engine.model.RuleModelParserStrategy; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.Collections; @@ -46,6 +47,9 @@ public class SqlRuleModelParser implements RuleModelParserStrategy { if (!CollectionUtils.isEmpty(sqlRule.getWhenErrorThen())) { int index = 0; for (Action act : sqlRule.getWhenErrorThen()) { + if (!StringUtils.hasText(act.getExecutor())) { + continue; + } RuleNodeModel action = new RuleNodeModel(); action.setId("error:action:" + index); action.setName("错误处理:" + index); @@ -85,6 +89,9 @@ public class SqlRuleModelParser implements RuleModelParserStrategy { if (!CollectionUtils.isEmpty(sqlRule.getActions())) { int index = 0; for (Action operation : sqlRule.getActions()) { + if (!StringUtils.hasText(operation.getExecutor())) { + continue; + } RuleNodeModel action = new RuleNodeModel(); action.setId("action:" + index); action.setName("执行动作:" + index);