From 1a251a36258e718e3c8b4c6da2d59aededf86000 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 17 May 2023 12:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/DeviceController.php | 2 +-
 app/Services/Admin/DeviceService.php       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/DeviceController.php b/app/Admin/Controllers/DeviceController.php
index 0d5f68c..1234c86 100644
--- a/app/Admin/Controllers/DeviceController.php
+++ b/app/Admin/Controllers/DeviceController.php
@@ -201,7 +201,7 @@ class DeviceController extends AdminController
         $monitorMode = $request->monitor_mode ?? 0;
         $monitorMode = MonitorMode::find($monitorMode);
 
-        $data = $this->service->getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, 2);
+        $data = $monitorMode ? $this->service->getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, 2):[];
     
         return $this->response()->success($data);
     }
diff --git a/app/Services/Admin/DeviceService.php b/app/Services/Admin/DeviceService.php
index 882d85a..566e7b6 100644
--- a/app/Services/Admin/DeviceService.php
+++ b/app/Services/Admin/DeviceService.php
@@ -88,7 +88,6 @@ class DeviceService extends BaseService
     public function getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, $columnNum = 3)
     {
         list($day, $diffDays, $xKeys) = $this->makeChartXkeys($startTime, $endTime);
-
         switch($monitorMode->type){
             case MonitorMode::TYPE_METEOROLOGICAL:
                 $dayliyReportQuery = MeteorologicalDailyReport::query();