From 3041a7d6dba13e237c4f21d3e46b88c35d376bf3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 10:14:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/RuleController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..1b352e1 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.*;
@@ -60,7 +61,7 @@
}
@RequestMapping(value = "/rule/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞鍗曞彿瑙勫垯")
public R add(Rule rule) {
if (Cools.isEmpty(rule.getRuleConnector())){
rule.setRuleConnector("-");
@@ -69,26 +70,31 @@
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();
}
@RequestMapping(value = "/rule/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊鍗曞彿瑙勫垯")
public R update(Rule rule){
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();
}
@RequestMapping(value = "/rule/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍗曞彿瑙勫垯")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
ruleService.deleteById(id);
--
Gitblit v1.9.1