From c8394b89c8473600622fafba8e0fde5e2a229dc9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jan 2021 12:52:47 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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 2860589..1d98eaa 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
@@ -426,7 +426,7 @@
 		if (!DataAuthUtil.hasAllShopAuth()) {
 			vipInfoListDto.setShopId(sysUsers.getShopId());
 		}
-		QueryUtil.setQueryLimitCom(sysUsers.getCompanyId());
+		QueryUtil.setQueryLimitCom(vipInfoListDto);
 		return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
 	}
 
@@ -485,7 +485,7 @@
 		int i=sysVipInfoDao.insert(vipInfo);
 
 		if (CollectionUtils.isNotEmpty(addVipDto.getLabels())) {
-			batchInsertLabel(addVipDto.getLabels(), user.getSuName(), vipInfo.getId());
+//			batchInsertLabel(addVipDto.getLabels(), user.getSuName(), vipInfo.getId());
 		}
 
 		//创建用户默认储值卡
@@ -536,9 +536,8 @@
 		int i = sysVipInfoDao.update(vipInfo);
 
 		if (CollectionUtils.isNotEmpty(modifyVipDto.getLabels())) {
-			sysVipLabelDao.deleteByVipId(modifyVipDto.getVipId());
-
-			batchInsertLabel(modifyVipDto.getLabels(), user.getSuName(), vipInfo.getId());
+//			sysVipLabelDao.deleteByVipId(modifyVipDto.getVipId());
+//			batchInsertLabel(modifyVipDto.getLabels(), user.getSuName(), vipInfo.getId());
 		}
 		return i;
 	}
@@ -551,7 +550,6 @@
 			sysVipLabel.setCreateTime(new Date());
 			sysVipLabel.setCreateBy(suName);
 			sysVipLabel.setLabel(iterator.next());
-			sysVipLabel.setVipId(id);
 			sysVipLabelDao.insert(sysVipLabel);
 		}
 	}

--
Gitblit v1.9.1