From 566f56c649205565f20bac598f29f81407b4b3d0 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 02 八月 2019 11:38:52 +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/web/WebSearchController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java index 0b1963a..39202e5 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java @@ -436,7 +436,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(WebControllerUtil.NODATA)); return; -- Gitblit v1.8.0