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/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