From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善
---
src/main/java/com/zy/crm/manager/controller/RuleController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/RuleController.java b/src/main/java/com/zy/crm/manager/controller/RuleController.java
index 4baed80..6690777 100644
--- a/src/main/java/com/zy/crm/manager/controller/RuleController.java
+++ b/src/main/java/com/zy/crm/manager/controller/RuleController.java
@@ -12,6 +12,7 @@
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.Rule;
import com.zy.crm.manager.service.RuleService;
+import com.zy.crm.manager.utils.RuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -69,10 +70,7 @@
if (Cools.isEmpty(rule.getRuleConnectorType())){
rule.setRuleConnectorType(1);
}
- /*
- * 瀹氫箟涓�涓鍒欙細澶达細String ruleHeader;浣擄細 String ruleBody;杩炴帴绗︼細String ruleConnector锛涜繛鎺ョ鏄惁鍚敤锛�0锛氬惎鐢紱1锛氫笉鍚敤銆傦細Integer ruleConnectorType锛涜鍒欐柟寮忥紙榛樿1锛氬綋鍓嶆棩鏈熸椂闂存埑锛夛細Integer ruleType锛�
- * 鏍规嵁瑙勫垯鑷姩鐢熸垚
- * */
+ rule.setRulePreview(RuleUtils.rule(rule));
ruleService.insert(rule);
return R.ok();
}
@@ -83,6 +81,14 @@
if (Cools.isEmpty(rule) || null==rule.getId()){
return R.error();
}
+ if (Cools.isEmpty(rule.getRuleConnector())){
+ rule.setRuleConnector("-");
+ rule.setRuleConnectorType(1);
+ }
+ if (Cools.isEmpty(rule.getRuleConnectorType())){
+ rule.setRuleConnectorType(1);
+ }
+ rule.setRulePreview(RuleUtils.rule(rule));
ruleService.updateById(rule);
return R.ok();
}
--
Gitblit v1.9.1