From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/hive/action/ArticleController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleController.java
index 04e7f46..a5a6be2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleController.java
@@ -49,7 +49,7 @@
AjaxResult showList(Article article, PaginationVO pageVo) {
article.setType(Dictionary.ARTICEL_TYPE_NAME_SCWZ);
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- article.setShopId(users.getShopId());
+ article.setCompanyId(users.getCompanyId());
return showList(currentService, article, pageVo);
}
@@ -61,7 +61,7 @@
article.setType(Dictionary.ARTICEL_TYPE_NAME_MDXY);
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- article.setShopId(users.getShopId());
+ article.setCompanyId(users.getCompanyId());
return showList(currentService, article, pageVo);
//return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findInPage(article, pageVo),currentService.findTotal(article));
}
@@ -73,7 +73,7 @@
public @ResponseBody AjaxResult queryAll(Article article, PaginationVO pageVo) {
article.setType(Dictionary.ARTICEL_TYPE_NAME_WXXMWZ);
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- article.setShopId(users.getShopId());
+ article.setCompanyId(users.getCompanyId());
return showList(currentService, article, pageVo);
//return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findInPage(article, pageVo),currentService.findTotal(article));
}
@@ -99,7 +99,7 @@
@RemoveRequestToken
public @ResponseBody AjaxResult addOrModify(Article article) {
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- article.setShopId(users.getShopId());
+ article.setCompanyId(users.getCompanyId());
if (article.getId() != null) {
return modify(currentService, article, "文章");
} else {
--
Gitblit v1.9.1