From 83bc58d2e1b1ee7afc203ca037673f2644321d44 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 31 Mar 2021 13:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=93=8D=E4=BD=9Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/taskdo.vue | 1 +
 server/utils/pagination.py              | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index fb2a642..28fb215 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -221,6 +221,7 @@
             >
             <el-link
               v-if="
+                scope.row.state != '已确认' &&
                 checkPermission(['record_confirm'])
               "
               type="success"
diff --git a/server/utils/pagination.py b/server/utils/pagination.py
index cff1464..5496da8 100644
--- a/server/utils/pagination.py
+++ b/server/utils/pagination.py
@@ -9,8 +9,9 @@ class PageOrNot:
     def paginate_queryset(self, queryset):
         if (self.paginator is None):
             return None
-        elif self.request.query_params.get('pageoff', None) and self.get_queryset().count()<500:
+        
+        elif self.request.query_params.get('pageoff', None) and self.request.query_params:
             return None
         elif self.request.query_params.get('pageoff', None) and self.get_queryset().count()>=500:
-            return ParseError('单次请求数据量大,请求中止')
+            raise ParseError('单次请求数据量大,请求中止')
         return self.paginator.paginate_queryset(queryset, self.request, view=self)
\ No newline at end of file