From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
index bb176b1..b5c1a18 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
@@ -23,7 +23,7 @@
 import com.yeshi.fanli.entity.bus.lable.QualityFlashSale;
 import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.QualityFactoryException;
+import com.yeshi.fanli.exception.goods.quality.QualityFactoryException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -446,8 +446,11 @@
 		for (TaoBaoGoodsBrief goodsBrief : goodsList) {
 			listAuctionId.add(goodsBrief.getAuctionId());
 		}
-		List<Long> listHas = taoBaoGoodsBriefService.listExistById(listAuctionId);
-
+		
+		List<Long> listHas =  new ArrayList<Long>();
+		if (listAuctionId.size() > 0) {
+			listHas = taoBaoGoodsBriefService.listExistById(listAuctionId);
+		}
 		
 		
 		// 閬嶅巻鍟嗗搧

--
Gitblit v1.8.0