From 5c9f8f71b676dda74c740b60e5af4b58c5026776 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 16 Aug 2023 09:25:48 +0800
Subject: [PATCH] fix:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 1328f06..c7379dc 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -181,6 +181,9 @@
             datas.put("dataTime", time);
         } else {
             datas = queryLastDataByMac(mac);
+            if (ObjectUtils.isEmpty(datas)){
+                return null;
+            }
         }
         //������������������
         Map<String, Object> result = new HashMap<>();

--
Gitblit v1.8.0