From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index 5a9d0c2..7a79777 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -106,6 +106,11 @@
 			return;
 		}
 		
+		// 榛樿娣樺疂
+		if (goodsType == null) {
+			goodsType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+		
 		List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
 				.getSuperHotSearchBySystemIdCache(system.getId(), goodsType);
 		if (superHotSearchList == null || superHotSearchList.size() == 0) {

--
Gitblit v1.8.0