From 460240a72ada1b2b85c3c959b19d71fabd16ae8d Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 14 Nov 2022 14:22: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=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index 11bfb2f..d217e77 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -79,9 +79,13 @@ class DeviceController extends Controller
      */
     public function typeStatusNum(Request $request)
     {
-        $baseId = $request->input('base_id');
+        $baseId = $request->input('base_id', 0);
+        $query = Device::query();
+        if($baseId){
+            $query->where('agricultural_base_id', $baseId);
+        }
 
-        $query = Device::where('agricultural_base_id', $baseId)->groupBy('type')->groupBy('status');
+        $query->groupBy('type')->groupBy('status');
 
         $list = $query->select(DB::raw('type, status, count(1) as num '))->get();
         $resData = [];