dev
parent
e34073919b
commit
9d1faa4bab
|
|
@ -119,7 +119,7 @@ class AgriculturalBaseController extends Controller
|
||||||
// $status = $request->input('status');
|
// $status = $request->input('status');
|
||||||
$list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) {
|
$list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) {
|
||||||
if($deviceType == DeviceType::Monitor || $deviceType == 1){
|
if($deviceType == DeviceType::Monitor || $deviceType == 1){
|
||||||
$q->where('is_recommend', 1);
|
$q->where('is_recommend', 1)->where('status', 1);
|
||||||
}
|
}
|
||||||
return $q->where('type', $deviceType);
|
return $q->where('type', $deviceType);
|
||||||
})->sort()->get();
|
})->sort()->get();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue