From 2a7a159b136805612e241e4e8e24affedfc23cc2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:07:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
index 1b8c0b4..80835bf 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java
@@ -153,7 +153,8 @@
@RequestMapping(value = "/findVipQuestionVipId")
public String findVipQuestionVipId(Long id) {
//获取会员所有的答案,分类型
- List<Question> questions=questionSerivce.findByVipId(id);
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ List<Question> questions=questionSerivce.findByVipId(id,user.getCompanyId());
WebUtil.getRequest().setAttribute("questions", questions);
return "admin/hive/mobile/CRM-account-detail";
--
Gitblit v1.9.1