|
|
|
|
@ -92,14 +92,14 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
$query->whereBetween('start_date', [$start_date, $end_date])
|
|
|
|
|
->orWhereBetween('end_date', [$start_date, $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);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
})->whereNotIn('status', [4, 5]);
|
|
|
|
|
if ($retList) {
|
|
|
|
|
// 返回列表
|
|
|
|
|
|