From fcf76f98acc0935773d8f96daeb1a9ad962d6a19 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Sat, 22 Nov 2025 13:20:30 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/OtherController.php |  3 +--
 app/Models/CourseSign.php                      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 2bf97ca..5b5bd80 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -182,8 +182,7 @@ class OtherController extends CommonController
         }
 
         // 全国数据
-        $countryArea = Company::groupBy('company_city')->whereNotNull('company_city')
-            ->get(['company_city']);
+        $countryArea = Company::groupBy('company_city')->whereNotNull('company_city')->get(['company_city']);
         $country = [];
         foreach ($countryArea as $item) {
             $country[] = [
diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index ef51e47..8200c18 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -120,14 +120,14 @@ class CourseSign extends SoftDeletesModel
             $query->whereBetween('start_date', [$start_date, $end_date])
                 ->whereBetween('end_date', [$start_date, $end_date]);
         })->whereHas('user', function ($query) use ($area) {
-            if ($area) {
-                if ($area == '苏州市外') {
-                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
-                    $query->whereNotIn('company_area', $allArea->pluck('value'));
-                } else {
-                    $query->where('company_area', $area);
-                }
-            }
+//            if ($area) {
+//                if ($area == '苏州市外') {
+//                    $allArea = ParameterDetail::where('parameter_id', 5)->get();
+//                    $query->whereNotIn('company_area', $allArea->pluck('value'));
+//                } else {
+//                    $query->where('company_area', $area);
+//                }
+//            }
         })->where(function ($query) use ($status, $course_ids) {
             if (isset($status)) {
                 $query->where('status', $status);