diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java
index 381e635..113efc7 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java
@@ -735,6 +735,9 @@ public class PatrolTaskResultMainController extends BaseController {
                 inspectionReportDataService.selectInspectionReportDataList(inspectionReportData);
         if (!inspectionReportDataList.isEmpty()) {
             inspectionReport.setReportDatalist(inspectionReportDataList);
+        } else {
+            logger.info("--exportExcelWordAndZip------report lineId:{},filter:{} no report data!", lineId, inspectionReport.getFilter());
+            return;
         }
 
         for (InspectionReportData reportData : inspectionReportDataList) {
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
index 78ce4ef..a1d14b8 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
@@ -154,8 +154,12 @@ public class PatrolTaskController extends BaseController {
                     taskListEx.add(task);
                 }
             }
-
-            return getDataTable(taskListEx);
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            int pageNum = pageDomain.getPageNum();
+            int pageSize = pageDomain.getPageSize();
+            int toNum = Math.min(taskListEx.size(), pageNum * pageSize);
+            List<PatrolTask> pageList = taskListEx.subList((pageNum - 1) * pageSize, toNum);
+            return getDataTable(0, pageList, taskListEx);
         }
         return getDataTable(taskList);
     }