From 8ee9b79c7124bd8a1d25b7a49b77df5b1956d21b Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
index 43aece2..54729d2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java
@@ -33,7 +33,7 @@
@RequestMapping(value = "/showList")
public @ResponseBody AjaxResult showList(SysVipLevel vipLevel,PaginationVO pageVo) {
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- vipLevel.setShopId(users.getShopId());
+ vipLevel.setCompanyId(users.getCompanyId());
return showList(cardLevelService,vipLevel,pageVo);
}
/**
@@ -43,6 +43,7 @@
public @ResponseBody AjaxResult addOrModify(SysVipLevel vipLevel) {
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
vipLevel.setShopId(users.getShopId());
+ vipLevel.setCompanyId(users.getCompanyId());
if (vipLevel.getId() != null) {
return modify(cardLevelService, vipLevel, "会员卡信息");
--
Gitblit v1.9.1