From d3529dd6424eb8befa46dd29ec5a9fd3dc726a6d Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Fri, 28 Nov 2025 11:48:52 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/OtherController.php |  2 +-
 app/Models/CourseSign.php                      | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index b53cf86..0155a3e 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -781,7 +781,7 @@ class OtherController extends CommonController
                     $data[] = [
                         'user_name' => $user->name ?? '',
                         'mobile' => $user->mobile ?? '',
-                        'company_name' => $user->company->company_name ?? '',
+                        'company_name' => $user->company->company_name ?? $user->company_name,
                         'company_position' => $user->company_position ?? '',
                         'company_city' => $user->company->company_city ?? '',
                         'company_area' => $user->company->company_area ?? '',
diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index d99da34..d6a47c7 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -410,14 +410,17 @@ class CourseSign extends SoftDeletesModel
             '常州团队',
             '国企元禾'
         ];
-        $company = Company::where(function ($query) use ($companyNameKeyword) {
-            foreach ($companyNameKeyword as $item) {
-                $query->orWhere('company_name', 'like', '%' . $item . '%');
-            }
-        })->get();
+//        $company = Company::where(function ($query) use ($companyNameKeyword) {
+//            foreach ($companyNameKeyword as $item) {
+//                $query->orWhere('company_name', 'like', '%' . $item . '%');
+//            }
+//        })->get();
         $list = User::whereIn('id', $courseSignByType->pluck('user_id'))
-            ->whereIn('company_id', $company->pluck('id'))
-            ->get();
+            ->where(function ($query) use ($companyNameKeyword) {
+                foreach ($companyNameKeyword as $item) {
+                    $query->orWhere('company_name', 'like', '%' . $item . '%');
+                }
+            })->get();
 
         if ($retList) {
             // 返回列表