From e04441da5005ca573f590f78b70c45d739a744dc Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 13:44:50 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 7906568..d9987fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -19,6 +19,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
@@ -165,7 +166,7 @@
if(!DataAuthUtil.hasAllShopAuth()) {
sysVipInfo.setShopId(user.getShopId());
}
-
+ QueryUtil.setQueryLimitCom(sysVipInfo);
return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
}
@@ -190,7 +191,8 @@
@GetMapping(value = "/findVipQuestions/{vipId}")
public AjaxResult findVipQuestions(@PathVariable("vipId") Long vipId) {
// 获取会员所有的答案,分类型
- List<Question> questions = questionSerivce.findByVipId(vipId);
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ List<Question> questions = questionSerivce.findByVipId(vipId,user.getCompanyId());
AjaxResult result = AjaxResult.buildSuccessInstance("获取成功");
List<QuestionVo> list = QuestionMapper.INSTANCE.entitiesToVos(questions);
result.putInMap("questions", list);
--
Gitblit v1.9.1