From bbe315f9dfeb248835e6278344114ae1b667f0cb Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 30 Aug 2023 09:50:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AgriculturalBaseController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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();