260302 最新消息列表 新增預計發布時間

app/Http/Controllers/Api/NewsController.php

@@ -30,11 +30,12 @@ class NewsController extends Controller
         $month = $request->input("month", -1);
         $locate = $locate == "tw" ? "zh_TW" : $locate;
         $result = [];
-
+        
+        $dateFilter = Carbon::now();
         //文章列表
         $news = News::where("visible", 1);
         if($month > 0 || $year > 0){
-            $dateFilter = Carbon::now();
+            
             if($year > 0){
                 $dateFilter->setYear(intval($year));
                 if($month > 0){
@@ -43,8 +44,18 @@ class NewsController extends Controller
                 }else{
                     $news = $news->whereBetween("post_date", [$dateFilter->copy()->startOfYear(), $dateFilter->copy()->endOfYear()]);
                 }
+                
             }
         }
+
+        $news = $news->where(fn($q) =>
+            $q->whereNull('start_date')
+            ->orWhere('start_date', '<=', $dateFilter)
+        )->where(fn($q) =>
+            $q->whereNull('end_date')
+            ->orWhere('end_date', '>=', $dateFilter)
+        );
+
         $news = $news->orderByDesc("order")->orderByDesc("post_date");
         $result["pagination"] = [
             "page" => $page,