Merge remote-tracking branch 'remotes/origin/master-chw' into dev-chw

# Conflicts:
#	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SearchBiz.java

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SearchBiz.java

@@ -196,7 +196,25 @@ public class SearchBiz {
                 }
             }
         });
-
+        //新闻
+//        threadPoolTaskExecutor.execute(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//                    ServiceResultVo<Article> articleServiceResultVo = new ServiceResultVo<>();
+//                    PageInfo articleList = articleBiz.getArticleList(1, ServiceConstant.NEWS_LIMIT, 1, keyWord);
+//                    List<Article> result = articleList == null ? Collections.EMPTY_LIST : articleList.getList() == null ? Collections.EMPTY_LIST : articleList.getList();
+//                    articleServiceResultVo.setData(result);
+//                    articleServiceResultVo.setTotalCount(articleList.getTotal());
+//                    searchResultVo.put(ServiceConstant.NEWS, articleServiceResultVo);
+//                } catch (Exception ex) {
+//                    ex.printStackTrace();
+//                } finally {
+//                    latch.countDown();
+//                }
+//
+//            }
+//        });
         try {
             latch.await();
         } catch (InterruptedException e) {