diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 92a1f1b..f564a82 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -111,14 +111,14 @@ class CourseSign extends SoftDeletesModel $courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date) ->whereDate('created_at', '<=', $end_date) ->whereHas('user', function ($query) use ($area) { -// if (isset($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);