From f57554f7da5e4d05b4b4bab99bf49ac9ca8c2038 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Apr 2022 21:35:12 +0800
Subject: [PATCH] feat:商品资料导出新增时长字段
---
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..18bbb30 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
@@ -11,10 +11,13 @@
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.authority.strategy.ScanQrCodeLogin;
+import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.ProjExceptionDao;
+import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dto.WebLoginDto;
+import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.statistics.StatisticsBusinessDataJob;
@@ -24,6 +27,7 @@
import java.security.Key;
import java.util.Map;
+import java.util.Objects;
/**
* @description 通用控制器,本action未经session过验证器
@@ -33,6 +37,7 @@
*/
@RequestMapping(value = "/common")
@Controller
+@CrossOrigin(origins = "*", maxAge = 3600)
public class CommonAction extends BaseAction {
@Autowired
@@ -62,6 +67,9 @@
@Autowired
SysShopInfoDao sysShopInfoDao;
+
+ @Autowired
+ SysCompanyDao sysCompanyDao;
/**
* 页面定向方法，每个权限模块公用一个，每个模块共享一个一级路径，已便于进行权限过滤
@@ -117,6 +125,8 @@
AjaxResult result = new AjaxResult();
authorityManager.initUserPower(result);
+ SysCompany sysCompany = sysCompanyDao.selectById(user.getCompanyId());
+ WebUtil.setSessionAttribute(HostInterceptor.ATTR_COMPANY, sysCompany);
result.putInMap("user",user);
result.setStatus(AjaxResult.STATUS_SUCCESS);
@@ -256,7 +266,6 @@
- @Autowired
/**
@@ -267,8 +276,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