三农网站-修改获取模块新闻、获取列表新闻的接口

app/JsonRpc/NewsService.php

@@ -373,10 +373,11 @@ class NewsService implements NewsServiceInterface
                     2 => '5',
                     3 => '0',
                 ];
-                $result = Article::where($where)->whereIn('level', $level)->orderBy("created_at", "desc")->limit($data['pagesize'])->get();
-            } elseif ($data['level'] == 2) {
-                $level = '2';
-                $result = Article::where($where)->where('level', $level)->orderBy("created_at", "desc")->limit($data['pagesize'])->get();
+                
+                $result = Article::where($where)->whereIn('level',$level)->orderBy("created_at","desc")->limit($data['pagesize'])->get();
+            }elseif($data['level']==2){
+                $level='2';
+                $result = Article::where($where)->where('level',$level)->orderBy("created_at","desc")->limit($data['pagesize'])->get();
 
             } else {
                 $level = '3';
@@ -422,7 +423,9 @@ class NewsService implements NewsServiceInterface
      */
     public function getWebsiteArticleList(array $data): array
     {
+
        $where[] = ['status', '=', 1];
+
        if(isset($data['keyword'])  && !empty($data['keyword'])){
             array_push($where,['article.title','like','%'.$data['keyword'].'%']);
         }