From dfc690389330e6f60c81eb09960ec7eb089e6b57 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Wed, 26 Nov 2025 17:31:56 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/OtherController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index b42c226..f8ca8b9 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -271,7 +271,14 @@ class OtherController extends CommonController
         $courseTypes = CourseType::whereIn('id', $course_type_id)->get();
         foreach ($courseTypes as $courseType) {
             // 获取课程
-            $courses2 = Course::where('type', $courseType->id)->orderBy('start_date', 'asc')->get();
+            $courses2 = Course::where('type', $courseType->id)
+                ->whereHas('course', function ($query) use ($start_date, $end_date) {
+                    // 开始结束日期的筛选。or查询
+                    if ($start_date && $end_date) {
+                        $query->whereBetween('start_date', [$start_date, $end_date])
+                            ->orWhereBetween('end_date', [$start_date, $end_date]);
+                    }
+                })->orderBy('start_date', 'asc')->get();
             foreach ($courses2 as $course) {
                 $courseTypesSum[] = [
                     'course_type' => $courseType->name,