From ae2efe9a1b627fcfbe61020e9e0a82470a3959d7 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 23:07:03 +0800
Subject: [PATCH] Merge branch 'hive2.0' into api

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index 645d0a1..b8c04c6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -212,8 +212,7 @@
 
 	@Override
 	public List<SysVipInfo> findByVipNoOrTel(String key) {
-		SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		return sysVipInfoDao.selectByVipNoOrTel(key, users.getShopId());
+		return sysVipInfoDao.selectByVipNoOrTel(key);
 
 	}
 
@@ -294,8 +293,7 @@
 
 	@Override
 	public List<SysVipInfo> findUserByKey(String keyWord) {
-		SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		return sysVipInfoDao.selectUserByKey(keyWord, users.getShopId());
+		return sysVipInfoDao.selectUserByKey(keyWord);
 	}
 	
 

--
Gitblit v1.9.1