diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index b413706..92866cd 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -85,7 +85,7 @@ class CourseSign extends SoftDeletesModel if (isset($area)) { if ($area == '苏州市外') { $allArea = ParameterDetail::where('parameter_id', 5)->get(); - $query->whereNotIn('company_area1', $allArea->pluck('value')); + $query->whereNotIn('company_area', $allArea->pluck('value')); } else { $query->where('company_area', $area); } @@ -110,14 +110,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 (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);