1

app/JsonRpc/NewsService.php

@@ -339,6 +339,7 @@ class NewsService implements NewsServiceInterface
      */
     public function updateArticle(array $data): array
     {
+        var_dump($data, '----------12-----------1');
         Db::beginTransaction();
         unset($data['user_type']);
         // unset($data['web_site_id']);
@@ -353,6 +354,15 @@ class NewsService implements NewsServiceInterface
             unset($data['survey_name']);
             unset($data['suvey_array']);
             unset($data['website_id']);
+            if ($data['hits'] == '') {
+                $data['hits'] = 0;
+            }
+            if ($data['is_original'] == '') {
+                $data['is_original'] = 0;
+            }
+            if ($data['status'] == '') {
+                $data['status'] = 0;
+            }
 
             $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
             $data['tag'] = isset($data['tag']) ? json_encode($data['tag']) : '';
@@ -433,7 +443,7 @@ class NewsService implements NewsServiceInterface
         } catch (\Throwable $ex) {
             Db::rollBack();
             var_dump($ex->getMessage());
-            return Result::error("更新失败", 0);
+            return Result::error("更新失败1" . $ex->getMessage(), 0);
         }
     }
 
@@ -486,11 +496,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("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 (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);
@@ -522,15 +532,15 @@ class NewsService implements NewsServiceInterface
                     1 => '4',
                     2 => '5',
                 ];
-                
-                $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';
-                $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';
+                $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'])) {
@@ -540,16 +550,16 @@ class NewsService implements NewsServiceInterface
                         'level' => $level,
                     ];
                     $result = Article::where($where)
-                    ->orderBy("updated_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("updated_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);
@@ -595,10 +605,10 @@ class NewsService implements NewsServiceInterface
                 }
             }
         })
-        ->orderBy("updated_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) {