master
cody 2 weeks ago
parent 10921fe210
commit d6960ac70b

@ -92,14 +92,14 @@ class CourseSign extends SoftDeletesModel
$query->whereBetween('start_date', [$start_date, $end_date]) $query->whereBetween('start_date', [$start_date, $end_date])
->orWhereBetween('end_date', [$start_date, $end_date]); ->orWhereBetween('end_date', [$start_date, $end_date]);
})->whereHas('user', function ($query) use ($area) { })->whereHas('user', function ($query) use ($area) {
if (isset($area)) { // if (isset($area)) {
if ($area == '苏州市外') { // if ($area == '苏州市外') {
$allArea = ParameterDetail::where('parameter_id', 5)->get(); // $allArea = ParameterDetail::where('parameter_id', 5)->get();
$query->whereNotIn('company_area', $allArea->pluck('value')); // $query->whereNotIn('company_area', $allArea->pluck('value'));
} else { // } else {
$query->where('company_area', $area); // $query->where('company_area', $area);
} // }
} // }
})->whereNotIn('status', [4, 5]); })->whereNotIn('status', [4, 5]);
if ($retList) { if ($retList) {
// 返回列表 // 返回列表

Loading…
Cancel
Save