diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 02fd208..8fb3868 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -83,14 +83,14 @@ class CourseSign extends SoftDeletesModel $total = 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 (isset($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); @@ -113,8 +113,8 @@ class CourseSign extends SoftDeletesModel ->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')); + $allArea = ParameterDetail::where('parameter_id', 5)->get(); + $query->whereNotIn('company_area', $allArea->pluck('value')); } else { $query->where('company_area', $area); }