From b9d39ade7d516d714cd8df7956bf34cf3a3fb8b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 Aug 2021 17:31:26 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 034df56..8980936 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
@@ -120,7 +120,9 @@
 			}
 		}
 		SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		sysVipInfo.setCompanyId(user.getCompanyId());
+		if(user!=null){
+			sysVipInfo.setCompanyId(user.getCompanyId());
+		}
 		sysVipInfo.setCreateTime(new Date());
 		sysVipInfo.setPointAll(0);
 		sysVipInfo.setIsDeal(SysVipInfo.UNDEAL_VIP);
@@ -427,8 +429,9 @@
 
 	@Override
 	public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
+		//todo 会员查询单独做控制
 		SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		if (!DataAuthUtil.hasAllShopAuth()) {
+		if (!DataAuthUtil.hasAllCustomerAuth()) {
 			vipInfoListDto.setShopId(sysUsers.getShopId());
 		}
 		QueryUtil.setQueryLimitCom(vipInfoListDto);

--
Gitblit v1.9.1