From f7129ed0dcff3b61f5d7b4e33acdcd194155b0f6 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 14 Nov 2022 15:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=95=B0=E9=87=8F=E6=9F=A5=E5=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/DeviceController.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index d217e77..dae32a2 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -14,6 +14,7 @@ use App\Models\SoilMonitoringLog;
 use App\Models\SoilMonitoringDailyLog;
 use App\Models\WaterQualityMonitoringLog;
 use App\Models\WaterQualityMonitoringDailyLog;
+use App\Models\AgriculturalBase;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Carbon\Carbon;
@@ -80,8 +81,18 @@ class DeviceController extends Controller
     public function typeStatusNum(Request $request)
     {
         $baseId = $request->input('base_id', 0);
+        $parent = $request->input('parent', 0);
+
         $query = Device::query();
-        if($baseId){
+        
+        if($parent){
+            $baseIds = AgriculturalBase::where('parent_id', $parent)->pluck('id')->toArray();
+            if(count($baseIds) > 0){
+                $query->whereIn('agricultural_base_id', $baseIds);
+            }
+        }
+        //如果查了镇街就不查指定基地了
+        if(!$parent && $baseId){
             $query->where('agricultural_base_id', $baseId);
         }