From 9e3999309355eeaa0bee62e7d643dd17490df0fb Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 22 三月 2019 14:26:27 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
index 629342c..327afbf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
@@ -340,6 +340,13 @@
 				if (taoBaoGoodsBrief == null)
 					continue; // 涓虹┖缁撴潫鏈寰幆
 
+				
+				String auctionUrl = taoBaoGoodsBrief.getAuctionUrl();
+				if (auctionUrl != null && auctionUrl.trim().length() > 0 && auctionUrl.contains("id=null")) {
+					auctionUrl =auctionUrl.replace("id=null","id="+ taoBaoGoodsBrief.getAuctionId());
+					taoBaoGoodsBrief.setAuctionUrl(auctionUrl);
+				}
+				
 				Map<String, Object> map = new HashMap<String, Object>();
 				
 				BoutiqueAutoRule boutiqueAutoRule = selectionGoods.getBoutiqueAutoRule();

--
Gitblit v1.8.0