diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java
index 21f9c124..49f82c97 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java
@@ -72,7 +72,7 @@ public class XinghanSendAlarmMessageRule implements MqttMessageRule {
             }
             // 将发送的信息原文本以List<String>形式存储在Redis中
             String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + ctx.getDeviceImei() + DEVICE_ALARM_MESSAGE_KEY_PREFIX);
-            if (data.isEmpty()) {
+            if (data == null || data.isEmpty()) {
                 return;
             }
             //
diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java
index ddbaefff..e1570f1b 100644
--- a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java
+++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java
@@ -36,7 +36,6 @@ public class VideoUploadController {
     private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
 
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @SaIgnore
     public R<List<String>> upload(@RequestParam("file") MultipartFile file) {
         if (file == null || file.isEmpty()) {
             return R.fail("上传文件不能为空");