Browse Source

修复回路历史列表的异常

zhj 10 months atrás
parent
commit
f50a4f57ff

+ 3 - 0
src/main/java/com/welampiot/controller/LoopController.java

@@ -499,6 +499,9 @@ public class LoopController {
         Integer id = loopDataLogVO.getId();
         if (id == null || id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
         if (loopDataLogVO.getDownload() != null && loopDataLogVO.getDownload() == 1) {
+            loopDataLogVO.setPage(null);
+            loopDataLogVO.setCount(null);
+        } else {
             loopDataLogVO.setPageAndCount(loopDataLogVO.getPage(), loopDataLogVO.getCount());
         }
         List<LoopDataLogDTO> loopDatalogList = loopDataLogService.getLoopDataLogListByLoopDataLogVO(loopDataLogVO);

+ 1 - 1
src/main/java/com/welampiot/vo/BaseVO.java

@@ -14,7 +14,7 @@ public class BaseVO {
     private Integer online;
     private String username;
     private Integer version;
-    private Integer download;
+    private Integer download = 0;
     private List<Integer> sectionList;
     private String path;