Merge branch 'dev_suggestPrice_20181119' into test6.8.2

caoyan
Commit 75386591d0638d37fea17cf8a86f1e8c8f3b7f54 2 parents b2c4a684 ed17fd40
Showing 1 changed file with 1 additions and 1 deletions
product/src/main/java/com/yoho/ufo/service/impl/ChannelSkuCompareServiceImpl.java
--- a/product/src/main/java/com/yoho/ufo/service/impl/ChannelSkuCompareServiceImpl.java
View file @7538659
+++ b/product/src/main/java/com/yoho/ufo/service/impl/ChannelSkuCompareServiceImpl.java
View file @7538659
@@ -260,7 +260,7 @@ public class ChannelSkuCompareServiceImpl implements IChannelSkuCompareService, 
     		bo.setId(csc.getId());
     		bo.setProductId(csc.getProductId());
     		bo.setSku(csc.getSku());
-     		bo.setProductName(productMap.get(csc.getProductId()).getProductName());
+     		bo.setProductName(null == productMap.get(csc.getProductId()) ? "" : productMap.get(csc.getProductId()).getProductName());
     		bo.setSizeName(sizeIdNameMap.get(csc.getSizeId()));
     		bo.setChannelPrice(getFormatPrice(csc.getChannelPrice()));
     		bo.setChannelUrl(csc.getChannelUrl());