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

---
 app/Http/Controllers/Admin/OtherController.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 63f1821..5e41b8d 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -683,8 +683,12 @@ class OtherController extends CommonController
 
             case 'course_total':
                 // 开课场次明细 - 与coursesHome算法一致
-                $calendars = Calendar::whereIn('course_id', $course_ids)
-                    ->whereBetween('date', [$start_date, $end_date])
+                $calendars = Calendar::whereBetween('date', [$start_date, $end_date])
+                    ->where(function ($query) use ($course_ids) {
+                        if (request('course_type_id')) {
+                            $query->whereIn('course_id', $course_ids);
+                        }
+                    })
                     ->with('course')
                     ->get();
 
@@ -711,9 +715,12 @@ class OtherController extends CommonController
 
             case 'course_day_total':
                 // 开课天数明细 - 与coursesHome算法一致
-                $calendars = Calendar::whereIn('course_id', $course_ids)
-                    ->whereBetween('date', [$start_date, $end_date])
-                    ->where('is_count_days', 1)
+                $calendars = Calendar::whereBetween('date', [$start_date, $end_date])
+                    ->where(function ($query) use ($course_ids) {
+                        if (request('course_type_id')) {
+                            $query->whereIn('course_id', $course_ids);
+                        }
+                    })->where('is_count_days', 1)
                     ->with('course')
                     ->get();