diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php index c64239e..897c332 100644 --- a/app/Http/Controllers/Admin/CompanyController.php +++ b/app/Http/Controllers/Admin/CompanyController.php @@ -89,6 +89,10 @@ class CompanyController extends BaseController { $all = request()->all(); $list = $this->model->with(['users' => function ($query) use ($all) { + $query->whereHas('courseSigns', function ($q) { + $q->where('status', 1); + })->with('courseSigns.course'); + }])->whereHas('users', function ($query) use ($all) { if (isset($all['course_type_id'])) { $query->whereHas('courses', function ($q) use ($all) { $q->where('type', $all['course_type_id']); @@ -105,10 +109,7 @@ class CompanyController extends BaseController if (isset($all['is_schoolmate'])) { $query->where('is_schoolmate', $all['is_schoolmate']); } - $query->whereHas('courseSigns', function ($q) { - $q->where('status', 1); - })->with('courseSigns.course'); - }])->where(function ($query) use ($all) { + })->where(function ($query) use ($all) { if (isset($all['filter']) && !empty($all['filter'])) { foreach ($all['filter'] as $condition) { $key = $condition['key'] ?? null;