diff --git a/app/Services/DeviceWarningService.php b/app/Services/DeviceWarningService.php
index 74163f5..5963ffa 100644
--- a/app/Services/DeviceWarningService.php
+++ b/app/Services/DeviceWarningService.php
@@ -58,6 +58,8 @@ class DeviceWarningService
         $rule = Setting::where('slug', $slug)->value('value');
         if($rule){
             $rule = json_decode($rule, true);
+        }else{
+            $rule = [];
         }
 
         foreach($rule as $key => $values){
diff --git a/app/Services/LinkosDeviceLogService.php b/app/Services/LinkosDeviceLogService.php
index 2ac1074..40c3656 100644
--- a/app/Services/LinkosDeviceLogService.php
+++ b/app/Services/LinkosDeviceLogService.php
@@ -236,8 +236,6 @@ class LinkosDeviceLogService
 
         $log->save();
         
-        //验证是否警报
-        (new DeviceWarningService())->judgeLog($device, $log, $reportedAt);
     }
 
     /**
@@ -373,6 +371,9 @@ class LinkosDeviceLogService
         }
 
         $log->save();
+
+        //验证是否警报
+        (new DeviceWarningService())->judgeLog($device, $log, $reportedAt);
     }
 
     /**