From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index e447a1f..e790d7c 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -24,6 +24,7 @@
 
 import java.security.Key;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @description 通用控制器,本action未经session过验证器
@@ -33,6 +34,7 @@
  */
 @RequestMapping(value = "/common")
 @Controller
+@CrossOrigin(origins = "*", maxAge = 3600)
 public class CommonAction extends BaseAction {
 
 	@Autowired
@@ -267,8 +269,11 @@
 	AjaxResult gwLinkUs(@RequestBody Map<String , Object> param) {
 
 		String title = "hive新客户在官网提交联系请求";
-		String content = "hive=>name:" + param.get("name") + "  tel:" +  param.get("tel") ;
-		DingDingRobotUtil.sendLink("https://oapi.dingtalk.com/robot/send?access_token=62bb902f0e3945f0ece31306b99abae043fc69a66da0ef04d89fd20bf58d88d8", content, title, "", "www.baidu.com");
+		if(Objects.nonNull(param.get("name"))){
+			String content = "hive=>name:" + param.get("name") + "  tel:" +  param.get("tel") ;
+			DingDingRobotUtil.sendLink("https://oapi.dingtalk.com/robot/send?access_token=62bb902f0e3945f0ece31306b99abae043fc69a66da0ef04d89fd20bf58d88d8", content, title, "", "www.baidu.com");
+
+		}
 
 		return AjaxResult.buildSuccessInstance("提交成功");
 	}

--
Gitblit v1.9.1