From 1510301f5673631ad24fb5634bff5d504eda5ccd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:54:03 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
index a8918dd..9a5e6d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
@@ -77,7 +77,7 @@
* out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
* return; }
*/
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 杩斿埄鍒竌pp
+ List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4, null); // 杩斿埄鍒竌pp
if (superHotSearchList == null || superHotSearchList.size() == 0) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NODATA));
return;
@@ -177,7 +177,7 @@
return;
}
- String kw = goodsClassService.getKwById(id);
+ String kw = goodsClassService.getKeysById(id);
filter = "[{\"type\": \"quantype\"}]";
JSONObject data = search(kw, pagesize, filter, order, startprice, endprice);
// if (StringUtil.isNullOrEmpty(kw)) {
--
Gitblit v1.8.0