diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
index 3030265..51f9455 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
@@ -534,13 +534,17 @@ public class IotCommonP2ServiceImpl {
             for (String s : datas.keySet()) {
                 List<String> survData = datas.get(s);
                 if(survData!=null && !survData.isEmpty()){
-                   List<String> yesterData =   survData.subList(yesterDataCounts,survData.size());
+                    List<String> finalData = new ArrayList<>();
+                    if(survData.size() > yesterDataCounts){
+                        finalData =   survData.subList(yesterDataCounts,survData.size());
+                    }
+
                    //拼接新旧数据
                     if(curDatas!=null) {
                         List<String> itemCurData = curDatas.get(s);
-                        yesterData.addAll(itemCurData);
+                        finalData.addAll(itemCurData);
                     }
-                    newData.put(s,yesterData);
+                    newData.put(s,finalData);
                 }
             }
         }