Merge remote-tracking branch 'origin/master'

sync-server/src/main/java/com/zq/sync/controller/ReportController.java

 package com.zq.sync.controller;
 
-import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.ResultVo;
 import com.zq.sync.service.DisabledService;
 import io.swagger.annotations.Api;

sync-server/src/main/java/com/zq/sync/service/DisabledService.java

@@ -225,13 +225,11 @@ public class DisabledService {
                 if(code==null||code!=1){
                     log.warn("上报错误 => {}",body);
                     }
+                }
                 if(!fdx06Page.hasNext()){
                     break;
                 }
                 page++;
-
-            }
-
         }
     }
 
@@ -285,6 +283,7 @@ public class DisabledService {
                 if(code==null||code!=1){
                     log.warn("上报错误 => {}",body);
                     }
+                }
                 if(!fdx05Page.hasNext()){
                     break;
                 }
@@ -292,7 +291,6 @@ public class DisabledService {
 
             }
         }
-    }
 
     public void fdx04(){
         int page = 1;
@@ -343,12 +341,11 @@ public class DisabledService {
                 if(code==null||code!=1){
                     log.warn("上报错误 => {}",body);
                     }
+                }
                 if(!fdx04Page.hasNext()){
                     break;
                 }
                 page++;
-
-            }
         }
     }
 
@@ -398,12 +395,11 @@ public class DisabledService {
                 if (code == null || code != 1) {
                     log.warn("上报错误 => {}", body);
                     }
+                }
                 if (!fdx03Page.hasNext()) {
                     break;
                 }
                 page++;
-
-            }
         }
     }