Merge branch 'news_10_18_liu' into dev

app/JsonRpc/NewsService.php

@@ -143,6 +143,7 @@ class NewsService implements NewsServiceInterface
     public function getArticleList(array $data): array
     {
         $where= [];
+
         if(isset($data['title'])  && $data['title']){
             array_push($where,['article.title','like','%'.$data['title'].'%']);
         }
@@ -170,6 +171,7 @@ class NewsService implements NewsServiceInterface
             $where[] =   ['article.title','like','%'.$data['keyword'].'%'];
             $where[] =   ['article.status', '1'];
         }
+        
         $rep = Article::where($where)
             ->whereNotIn('status',[404])
             ->leftJoin('category','article.catid','category.id')