From 4936b09e06d799282ff6cf9002d0461956b8cf86 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 18:02:45 +0800
Subject: [PATCH] 修改微商城广告bug
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java | 29 +++++++++++++++--------------
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java | 4 +++-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
index 3057829..d07aa26 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopAdvertisTypeAction.java
@@ -103,6 +103,7 @@
public @ResponseBody
AjaxResult modifyShopAdvertisType(@RequestBody ShopAdvertisType newShopAdvertisType) {
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+
if (StringUtils.isNotBlank(newShopAdvertisType.getNodeStyle())) {
String style = newShopAdvertisType.getNodeStyle();
style = style.replaceAll("px", "rpx")
@@ -116,7 +117,7 @@
newShopAdvertisType.setCreateBy(user.getSuName());
newShopAdvertisType.setUpdateBy(user.getSuName());
-
+ newShopAdvertisType.setCompanyId(user.getCompanyId());
shopAdvertisTypeDao.insert(newShopAdvertisType);
} else {
shopAdvertisTypeDao.updateByModel(newShopAdvertisType);
@@ -135,6 +136,7 @@
collect.forEach(ad -> {
ad.setCreateBy(user.getSuName());
ad.setUpdateBy(user.getSuName());
+ ad.setCompanyId(user.getCompanyId());
ad.setTypeId(newShopAdvertisType.getAdtId());
});
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java
index 6de4994..7a02327 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java
@@ -1,30 +1,29 @@
package com.matrix.system.shopXcx.action;
+import com.matrix.core.anotations.RemoveRequestToken;
+import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.constance.SystemMessageCode;
+import com.matrix.core.exception.GlobleException;
+import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.StringUtils;
-import com.matrix.core.web.BaseAction;
-import com.matrix.core.constance.SystemErrorCode;
-import com.matrix.core.anotations.RemoveRequestToken;
+import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.shopXcx.bean.ShopPage;
import com.matrix.system.shopXcx.dao.ShopPageDao;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import com.matrix.core.exception.GlobleException;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.matrix.core.anotations.SaveRequestToken;
-import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.WebUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.servlet.ModelAndView;
import java.util.List;
import java.util.Map;
-import com.matrix.system.shopXcx.bean.ShopPage;
-import org.springframework.web.servlet.ModelAndView;
/**
* @description 小程序页面
@@ -77,10 +76,11 @@
@RemoveRequestToken
@RequestMapping(value = "/addShopPage")
public @ResponseBody AjaxResult addShopPage(ShopPage shopPage) {
- if (serviceUtil.addCheckRepeat("shop_page", "code", shopPage.getCode())) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ if (serviceUtil.addCheckRepeatTowColumn("shop_page", "code", shopPage.getCode(),"company_id", user.getCompanyId())) {
throw new GlobleException("code重复");
}
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
shopPage.setCreateBy(user.getSuName());
shopPage.setUpdateBy(user.getSuName());
shopPage.setCompanyId(user.getCompanyId());
@@ -103,9 +103,10 @@
@RequestMapping(value = "/modifyShopPage")
public @ResponseBody AjaxResult modifyShopPage(ShopPage newShopPage) {
ShopPage oldShopPage = WebUtil.getSessionAttribute(BEV);
-
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
// 校验去重
- if (serviceUtil.updateCheckRepeat("shop_page",
+ if (serviceUtil.updateCheckRepeatTowColumn("shop_page",
+ "company_id", user.getCompanyId(),
"code", newShopPage.getCode(),
"id",newShopPage.getId())) {
throw new GlobleException("编号" + newShopPage.getCode() + "重复");
--
Gitblit v1.9.1