diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 86657dc..ef5ede1 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -292,7 +292,7 @@ class OtherController extends CommonController } } // 附加历史课程数据 - $historyCourses = HistoryCourse::where('calendar', function ($query) { + $historyCourses = HistoryCourse::whereHas('calendar', function ($query) { $query->where('is_count_people', 1); })->where(function ($query) use ($start_date, $end_date) { // 开始结束日期的筛选。or查询 diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index d45bf6b..f4893db 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -110,7 +110,7 @@ class CourseSign extends SoftDeletesModel // 基础数据 $baseTotal = $totalQuery->count(); // 历史数据 - $historyTotal = HistoryCourse::where('calendar', function ($query) { + $historyTotal = HistoryCourse::whereHas('calendar', function ($query) { $query->where('is_count_people', 1); })->where(function ($query) use ($start_date, $end_date) { // 开始结束日期的筛选。or查询 @@ -135,7 +135,7 @@ class CourseSign extends SoftDeletesModel } else { $baseTotal = $user->count(); // 历史数据 - $historyTotal = HistoryCourse::where('calendar', function ($query) { + $historyTotal = HistoryCourse::whereHas('calendar', function ($query) { $query->where('is_count_people', 1); })->where(function ($query) use ($start_date, $end_date) { // 开始结束日期的筛选。or查询