diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f447f9c34..e8a04b7a7 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2273,8 +2273,7 @@ public class BaseController { } String titleTime=noExportMap.get("timeRange"); Map> headMap=ExcelCsv.ExcelCsvHeader(msgProp, titleList, noExportMap, classMap, 1); - Map> dataList=ExcelCsv.setDataList(msgProp, dataMap, map); - ByteArrayOutputStream out = new ByteArrayOutputStream(); + Map>> dataList=ExcelCsv.setDataList(msgProp, dataMap, map); ExcelCsv.writeCSVFile(response,titleList,headMap,dataList,fileName,titleTime,msgProp); } @@ -2612,7 +2611,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg, cfgIndexList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2639,7 +2638,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,baseCfgList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2666,7 +2665,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgAppList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2692,9 +2691,6 @@ public class BaseController { } hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,cfgFeatrureList, hasData); } - if(hasData) { - page.setPageNo(1); - } }else{ hasData = false; } @@ -2724,7 +2720,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2761,7 +2757,7 @@ public class BaseController { hasData=configSynchronizationService.auditAppIpData(userRegionList, page,auditBatchCfg,list,hasData,true); if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2799,7 +2795,7 @@ public class BaseController { hasData=configSynchronizationService.auditAppIpData(userRegionList, page,auditBatchCfg,list,hasData,true); if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false; @@ -2848,7 +2844,7 @@ public class BaseController { hasData=commonPolicyService.auditNtcMaatData(cfgList, page, auditBatchCfg,newList, hasData); } if(hasData) { - page.setPageNo(1); + page.setPageNo(page.getNext()); } }else{ hasData = false;