diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php index 638e32e..61a72c5 100644 --- a/app/Http/Controllers/AgriculturalBaseController.php +++ b/app/Http/Controllers/AgriculturalBaseController.php @@ -126,9 +126,13 @@ class AgriculturalBaseController extends Controller { $deviceType = $request->input('device_type', DeviceType::Monitor); // $status = $request->input('status'); - $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) { + $isRecommend = $request->input('is_recommended', 1) ?? 0; + $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType, $isRecommend) { if($deviceType == DeviceType::Monitor || $deviceType == 1){ - $q->where('is_recommend', 1)->where('status', 1); + if($isRecommend){ + $q->where('is_recommend', 1); + } + $q->where('status', 1); } return $q->where('type', $deviceType); })->sort()->get();