From e11e50dd2d3a3988194513ac52b8525176fd67e2 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 24 Nov 2025 16:22:06 +0800
Subject: [PATCH 1/2] update

---
 app/Http/Controllers/Admin/CompanyController.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php
index c64239e..530d5d9 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('user', 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;

From 938c32996d1ae19cd5c36a4837c3533496ab8faf Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 24 Nov 2025 16:23:05 +0800
Subject: [PATCH 2/2] update

---
 app/Http/Controllers/Admin/CompanyController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php
index 530d5d9..897c332 100644
--- a/app/Http/Controllers/Admin/CompanyController.php
+++ b/app/Http/Controllers/Admin/CompanyController.php
@@ -92,7 +92,7 @@ class CompanyController extends BaseController
             $query->whereHas('courseSigns', function ($q) {
                 $q->where('status', 1);
             })->with('courseSigns.course');
-        }])->whereHas('user', function ($query) use ($all) {
+        }])->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']);