Merge branch 'master' into dev1

Administrator

2018-10-30 012a2320fd0402adf1685fcc3c28261b03c4c4b5

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

@@ -476,7 +476,8 @@
      

      // 获取推荐词

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

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

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

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

         listRecommendWords = TaoBaoUtil.getSuguestSearch(kw);

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

            listRecommendWords = new ArrayList<String>();