From baf96dd997d75cdc3cdd77244fb969f3a97d2155 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 23 Oct 2023 12:01:10 +0800 Subject: [PATCH] Update --- app/Http/Controllers/AgriculturalBaseController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AgriculturalBaseController.php b/app/Http/Controllers/AgriculturalBaseController.php index c03c645..256f389 100644 --- a/app/Http/Controllers/AgriculturalBaseController.php +++ b/app/Http/Controllers/AgriculturalBaseController.php @@ -129,12 +129,13 @@ class AgriculturalBaseController extends Controller $user = $request->user(); $deviceType = $request->input('device_type', DeviceType::Monitor->value); $isRecommend = $request->input('is_recommended', 0) ?? 0; + $all = $request->input('all', 0); $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType, $isRecommend) { $q->when($deviceType == DeviceType::Monitor->value, function ($q) use ($isRecommend) { $q->when($isRecommend, fn ($q) => $q->where('is_recommend', 1))->where('status', 1); })->where('type', $deviceType); - })->when(! $user->isAdministrator(), function ($q) use ($user) { + })->when(! $all && ! $user->isAdministrator(), function ($q) use ($user) { $q->whereRaw("id in (select base_id from admin_user_bases where user_id = {$user->id})"); })->sort()->get();