From 9253517ff8a10e2df7924fdf6e0b737544d1a859 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 17:30:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 75f839a..8a6f81e 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
@@ -17,6 +17,7 @@
 import com.matrix.system.common.tools.ServiceUtil;
 import com.matrix.system.constance.Dictionary;
 import com.matrix.system.constance.TableMapping;
+import com.matrix.system.hive.action.util.QueryUtil;
 import com.matrix.system.hive.bean.*;
 import com.matrix.system.hive.dao.*;
 import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -425,6 +426,7 @@
 		if (!DataAuthUtil.hasAllShopAuth()) {
 			vipInfoListDto.setShopId(sysUsers.getShopId());
 		}
+		QueryUtil.setQueryLimitCom(vipInfoListDto);
 		return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
 	}
 
@@ -448,6 +450,7 @@
 		}
 
 		SysVipInfo vipInfo = new SysVipInfo();
+
 		vipInfo.setPhoto(addVipDto.getPhoto());
 		vipInfo.setVipName(addVipDto.getVipName());
 		vipInfo.setVipNo(addVipDto.getVipNo());

--
Gitblit v1.9.1