Merge branch 'web_sannong_fr' into dev

app/JsonRpc/NewsService.php

@@ -559,7 +559,8 @@ class NewsService implements NewsServiceInterface
             ];
             var_dump($data, 'data-----------------');
 
-            //如果是4：热点资讯 5：资讯推荐；
+            //如果是4：最新资讯（数据库已不存在） 5：资讯推荐（数据库已不存在）；
+            // 1：头条资讯；2：轮播图；6：热点资讯；（数据库）
             var_dump($where, 'where-----------------');
 
             $result = Article::where($where)
@@ -574,13 +575,13 @@ class NewsService implements NewsServiceInterface
                     //updated_at最近三十天;
                         ->where('updated_at', '>', date("Y-m-d H:i:s", strtotime("-30 day")));
                 })
-                ->when($data['level'] != 5, function ($query) {
+                ->when($data['level'] == 4, function ($query) {
                     $query->orderBy("updated_at", "desc");
                 })
                 ->when(!empty($data['level']), function ($query) use ($data) {
                     if ($data['level'] != 4 && $data['level'] != 5) {
                         $query->whereRaw("JSON_CONTAINS(level, '" . intval($data['level']) . "') = 1")
-                            ->orWhereNull("level");
+                                ->orderBy("updated_at", "desc");
                     }
                 })
                 ->offset($placeid)
@@ -611,43 +612,13 @@ class NewsService implements NewsServiceInterface
                 'catid' => $catid,
             ];
             $placeid = isset($data['placeid']) && !empty($data['placeid']) ? $data['placeid'] - 1 : 0;
-            // 级别：0：未分类 1：头条 2：轮播图 3：推荐图 4：热点资讯 5：资讯推荐
+            // 1：文字新闻；2：轮播图；3：图文；
+            // 级别：0：未分类 
+            // 3：推荐图片
             if ($data['level'] == 1) {
-
-                $result = Article::where($where)
-                    ->where(function ($query) use ($data) {
-                        $query->whereRaw("JSON_CONTAINS(level, '" . intval($data['level']) . "') = 1")
-                            ->orWhereNull("level")
-                            ->orWhereRaw("level = '[]'");
-                    })
-                    ->where(function ($query) use ($data) {
-                        $query->whereRaw("JSON_CONTAINS(ignore_ids, '" . intval($data['website_id']) . "') = 0")
-                            ->orWhereNull("ignore_ids");
-                    })
-                    ->orderBy("updated_at", "desc")
-                    ->offset($placeid)
-                    ->limit($data['pagesize'])
-                    ->get();
-            } elseif ($data['level'] == 2) {
-                $level = '2';
-                $result = Article::where($where)
-                    ->where(function ($query) use ($data) {
-                        $query->whereRaw("JSON_CONTAINS(level, '" . intval($data['level']) . "') = 1")
-                            ->orWhereNull("level")
-                            ->orWhereRaw("level = '[]'");
-                    })
-                    ->where(function ($query) use ($data) {
-                        $query->whereRaw("JSON_CONTAINS(ignore_ids, '" . intval($data['website_id']) . "') = 0")
-                            ->orWhereNull("ignore_ids");
-                    })
-                    ->orderBy("updated_at", "desc")
-                    ->offset($placeid)
-                    ->limit($data['pagesize'])
-                    ->get();
-
-            } else {
-                $level = '3';
-                $result = Article::where($where)
+                $data['level'] = 0;
+             } 
+            $result = Article::where($where)
                     ->where(function ($query) use ($data) {
                         $query->whereRaw("JSON_CONTAINS(level, '" . intval($data['level']) . "') = 1")
                             ->orWhereNull("level")
@@ -661,7 +632,6 @@ class NewsService implements NewsServiceInterface
                     ->offset($placeid)
                     ->limit($data['pagesize'])
                     ->get();
-            }
             if (empty($result)) {
                 return Result::error("此栏目暂无相关新闻", 0);
             }
@@ -670,10 +640,7 @@ class NewsService implements NewsServiceInterface
 
         }
         return Result::success($result);
-
-        
     }
-
     /**
      *获取新闻列表
      * @param array $data