diff --git a/src/main/java/com/zhgd/xmgl/task/GsWeldingTask.java b/src/main/java/com/zhgd/xmgl/task/GsWeldingTask.java index 8fa1a1710..693be8906 100644 --- a/src/main/java/com/zhgd/xmgl/task/GsWeldingTask.java +++ b/src/main/java/com/zhgd/xmgl/task/GsWeldingTask.java @@ -185,11 +185,11 @@ public class GsWeldingTask { checkErr(jsonObject, "请求获取设备实时数据历史异常"); JSONArray dataList = jsonObject.getJSONArray("dataList"); if (CollUtil.isEmpty(dataList)) { - return gsWeldingWaveformList; + continue; } JSONArray list = dataList.getJSONObject(0).getJSONArray("list"); if (CollUtil.isEmpty(list) || CollUtil.isEmpty(list.getJSONObject(0))) { - return gsWeldingWaveformList; + continue; } for (int j = 0; j < list.size(); j++) { JSONObject jo1 = list.getJSONObject(j);