Merge branch 'web_sannong_fr' into dev

app/JsonRpc/NewsService.php

@@ -487,11 +487,11 @@ class NewsService implements NewsServiceInterface
             foreach ($category as $val) {
                 array_push($category_ids, $val['category_id']);
             }
-            if (isset($data['placeid'])) {
-                $placeid = $data['placeid'] - 1;
-                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("created_at", "desc")->offset($placeid)->limit($data['pageSize'])->get();
-            } else {
-                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("created_at", "desc")->offset(0)->limit($data['pageSize'])->get();
+            if(isset($data['placeid'])){
+                $placeid=$data['placeid']-1;
+                $result=Article::where('status',1)->where('level',$data['level'])->whereIn("catid",$category_ids)->orderBy("updated_at","desc")->offset($placeid)->limit($data['pageSize'])->get();
+            }else{
+                $result=Article::where('status',1)->where('level',$data['level'])->whereIn("catid",$category_ids)->orderBy("updated_at","desc")->offset(0)->limit($data['pageSize'])->get();
             }
             if (empty($result)) {
                 return Result::error("暂无头条新闻", 0);
@@ -524,15 +524,15 @@ class NewsService implements NewsServiceInterface
                     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("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';
-                $result = Article::where($where)->where('level', $level)->orderBy("created_at", "desc")->limit($data['pagesize'])->get();
+            }else{
+                $level='3';
+                $result = Article::where($where)->where('level',$level)->orderBy("updated_at","desc")->limit($data['pagesize'])->get();
             }
             $result = $result->toArray();
             if (!empty($result) && isset($data['placeid']) && !empty($data['placeid'])) {
@@ -542,16 +542,16 @@ class NewsService implements NewsServiceInterface
                         'level' => $level,
                     ];
                     $result = Article::where($where)
-                        ->orderBy("created_at", "desc")
-                        ->offset($placeid)
-                        ->limit($data['pagesize'])->get();
-                } else {
+                    ->orderBy("updated_at","desc")
+                    ->offset($placeid)
+                    ->limit($data['pagesize'])->get();
+                }else{
                     $result = Article::where($where)
-                        ->whereIn('level', $level)
-                        ->offset($placeid)
-                        ->orderBy("created_at", "desc")
-                        ->limit($data['pagesize'])->get();
-                }
+                    ->whereIn('level',$level)
+                    ->offset($placeid)
+                    ->orderBy("updated_at","desc")
+                    ->limit($data['pagesize'])->get();
+                } 
             }
             if (empty($result)) {
                 return Result::error("此栏目暂无相关新闻", 0);
@@ -598,10 +598,10 @@ class NewsService implements NewsServiceInterface
                 }
             }
         })
-            ->orderBy("created_at", "desc")
-            ->limit($data['pageSize'])
-            ->offset(($data['page'] - 1) * $data['pageSize'])
-            ->get();
+        ->orderBy("updated_at", "desc")
+        ->limit($data['pageSize'])
+        ->offset(($data['page'] - 1) * $data['pageSize'])
+        ->get();
 
         $count = Article::where(function ($query) use ($where) {
             foreach ($where as $condition) {