店铺内找相似去除数量限制

@@ -103,9 +103,6 @@ public class SearchLikeInShopService {
 		if (!tempProductList.isEmpty()) {
 			productListResults = productIndexBaseService.getProductListWithPricePlan(tempProductList);
 		}
-		if (productListResults == null || productListResults.size() < 4) {
-			productListResults = new ArrayList<Map<String, Object>>();
-		}
 		JSONObject result = new JSONObject();
 		result.put("page", 1);
 		result.put("page_total", 1);
@@ -121,7 +118,7 @@ public class SearchLikeInShopService {
 		// 1、设置SearchParam
 		SearchParam searchParam = new SearchParam();
 		// 2)设置query和filter
-		searchParam.setQuery(this.builderQueryBuilder(productInfoInEs, inSmallSort ? "40%" : "20%"));
+		searchParam.setQuery(this.builderQueryBuilder(productInfoInEs, inSmallSort ? "30%" : "20%"));
 		searchParam.setFiter(this.builderFilterBuilder(productInfoInEs, productSkns, inSmallSort));
 		// 3、设置排序规则[按打分排序]
 		List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
@@ -156,6 +153,9 @@ public class SearchLikeInShopService {
 		}
 		// 3)设置品类信息
 		Integer smallSortId = productInfoInEs.getInteger("smallSortId");
+		if (!searchLikeHelper.isLegalInteger(smallSortId)) {
+			return boolFilter;
+		}
 		if (inSmallSort) {
 			boolFilter.must(QueryBuilders.termQuery("smallSortId", smallSortId));
 		} else {
@@ -163,7 +163,7 @@ public class SearchLikeInShopService {
 		}
 		return boolFilter;
 	}
-	
+
 	private QueryBuilder builderQueryBuilder(JSONObject productInfoInEs, String minimumShouldMatch) {
 		String queryString = searchLikeHelper.genYohoQueryStringWithBrandName(productInfoInEs);
 		String productFeatureFactor = productInfoInEs.getString("productFeatureFactor");