Merge branch 'web_sannong_fr'

app/JsonRpc/NewsService.php

@@ -531,12 +531,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';