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

app/Http/Controllers/Api/NewsController.php

@@ -32,6 +32,8 @@ class NewsController extends Controller
         $result = [];
         
         $dateFilter = Carbon::now();
+        $now = Carbon::now(); 
+
         //文章列表
         $news = News::where("visible", 1);
         if($month > 0 || $year > 0){
@@ -50,10 +52,10 @@ class NewsController extends Controller
 
         $news = $news->where(fn($q) =>
             $q->whereNull('start_date')
-            ->orWhere('start_date', '<=', $dateFilter)
+            ->orWhere('start_date', '<=', $now)
         )->where(fn($q) =>
             $q->whereNull('end_date')
-            ->orWhere('end_date', '>=', $dateFilter)
+            ->orWhere('end_date', '>=', $now)
         );
 
         $news = $news->orderByDesc("order")->orderByDesc("post_date");