Browse Source

260304 最新消息列表 修改預計發布時間

OMEGA\lulufj.ho 1 month ago
parent
commit
976a420a3c
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      app/Http/Controllers/Api/NewsController.php

+ 4
- 2
app/Http/Controllers/Api/NewsController.php View File

32
         $result = [];
32
         $result = [];
33
         
33
         
34
         $dateFilter = Carbon::now();
34
         $dateFilter = Carbon::now();
35
+        $now = Carbon::now(); 
36
+
35
         //文章列表
37
         //文章列表
36
         $news = News::where("visible", 1);
38
         $news = News::where("visible", 1);
37
         if($month > 0 || $year > 0){
39
         if($month > 0 || $year > 0){
50
 
52
 
51
         $news = $news->where(fn($q) =>
53
         $news = $news->where(fn($q) =>
52
             $q->whereNull('start_date')
54
             $q->whereNull('start_date')
53
-            ->orWhere('start_date', '<=', $dateFilter)
55
+            ->orWhere('start_date', '<=', $now)
54
         )->where(fn($q) =>
56
         )->where(fn($q) =>
55
             $q->whereNull('end_date')
57
             $q->whereNull('end_date')
56
-            ->orWhere('end_date', '>=', $dateFilter)
58
+            ->orWhere('end_date', '>=', $now)
57
         );
59
         );
58
 
60
 
59
         $news = $news->orderByDesc("order")->orderByDesc("post_date");
61
         $news = $news->orderByDesc("order")->orderByDesc("post_date");