master
cody 4 weeks ago
parent c8140e305e
commit fd208b49ea

@ -86,7 +86,7 @@ class CourseSign extends SoftDeletesModel
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'))->orWhereNull('company_area');
} else { } else {
$query->where('company_area', $area); $query->where('company_area', $area);
} }
@ -114,7 +114,7 @@ class CourseSign extends SoftDeletesModel
if ($area) { if ($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'))->orWhereNull('company_area');
} else { } else {
$query->where('company_area', $area); $query->where('company_area', $area);
} }

Loading…
Cancel
Save