From 81f7b163d6d70ad3e154ca012b76be7027b9514f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Dec 2020 15:41:16 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 7446c0e..dc9a7fa 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
@@ -9,6 +9,7 @@
 import com.matrix.system.app.dto.VipInfoListDto;
 import com.matrix.system.app.vo.VipInfoListVo;
 import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
 import com.matrix.system.common.tools.ServiceUtil;
 import com.matrix.system.constance.Dictionary;
 import com.matrix.system.constance.TableMapping;
@@ -422,7 +423,14 @@
 	@Override
 	public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
 		SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-		vipInfoListDto.setShopId(sysUsers.getShopId());
+		if (!DataAuthUtil.hasAllShopAuth()) {
+			vipInfoListDto.setShopId(sysUsers.getShopId());
+		}
 		return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
 	}
+
+	@Override
+	public com.matrix.system.app.vo.VipInfoVo findApiVipInfoById(Long id) {
+		return sysVipInfoDao.selectVipInfoById(id);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1