From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..8b46122 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, "会员卡信息");
@@ -77,8 +78,6 @@
*/
@RequestMapping(value = "/all")
public @ResponseBody AjaxResult all(SysVipLevel sysVipLevel) {
- SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- sysVipLevel.setShopId(users.getShopId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardLevelService.findByModel(sysVipLevel), null);
}
}
--
Gitblit v1.9.1