Merge remote-tracking branch 'origin/master'

Administrator

2018-11-06 caf12df994eb3122b6969279afb1a8105e67bfec

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java

@@ -477,7 +477,7 @@
        // 获取推荐词

        List<String> listRecommendWords = new ArrayList<String>();

        // 综合 查询第一页时获取候选词

        if (page == 0 && !StringUtil.isNullOrEmpty(order) && "4".equalsIgnoreCase(order)) {

        if (page == 0) {

            listRecommendWords = TaoBaoUtil.getSuguestSearch(kw);

            if (listRecommendWords == null || listRecommendWords.size() == 0) {

                listRecommendWords = new ArrayList<String>();