Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

app/JsonRpc/NewsService.php

@@ -534,12 +534,12 @@ class NewsService implements NewsServiceInterface
                     0 => '1',
                     1 => '4',
                     2 => '5',
+                    3 => '0',
                 ];
-
-                $result = Article::where($where)->whereIn('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
-            } elseif ($data['level'] == 2) {
-                $level = '2';
-                $result = Article::where($where)->where('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
+                $result = Article::where($where)->whereIn('level',$level)->orderBy("updated_at","desc")->limit($data['pagesize'])->get();
+            }elseif($data['level']==2){
+                $level='2';
+                $result = Article::where($where)->where('level',$level)->orderBy("updated_at","desc")->limit($data['pagesize'])->get();
 
             } else {
                 $level = '3';
@@ -654,7 +654,7 @@ class NewsService implements NewsServiceInterface
             return Result::error("查询失败", 0);
         }
         $result['category_id'] = $category['category_id'];
-        $result['cat_name'] = $category['name'];
+        $result['cat_name'] = $category['alias'];
         return Result::success($result);
     }