From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
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..7dfe412 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,34 +1,33 @@
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 小程序页面
- * @author yourName
+ * @author jyy
* @date 2020-04-03 14:56
*/
@Controller
@@ -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