diff --git a/marking_app/lib/routes/RouterManager.dart b/marking_app/lib/routes/RouterManager.dart
index f842a84..e836a15 100644
--- a/marking_app/lib/routes/RouterManager.dart
+++ b/marking_app/lib/routes/RouterManager.dart
@@ -188,11 +188,11 @@ class RouterManager {
     int id = int.parse(params['id']![0]);
     String title = params['title']![0];
     int? schoolId;
-    if (params['schoolId'] != null && params['schoolId']![0] != null && params['schoolId']![0] != 'null') {
+    if (params['schoolId'] != null && params['schoolId']?[0] != null && params['schoolId']![0] != 'null') {
       schoolId = int.parse(params['schoolId']![0]);
     }
     int? gradeId;
-    if (params['gradeId'] != null && params['gradeId']![0] != null && params['gradeId']![0] != 'null') {
+    if (params['gradeId'] != null && params['gradeId']?[0] != null && params['gradeId']![0] != 'null') {
       gradeId = int.parse(params['gradeId']![0]);
     }
     String? className = params['className']?[0];
@@ -279,11 +279,11 @@ class RouterManager {
       int jobId = int.parse(params['jobId']![0]);
       String className = params['className']![0];
       int? schoolId;
-      if (params['schoolId'] != null && params['schoolId']![0] != null && params['schoolId']![0] != 'null') {
+      if (params['schoolId'] != null && params['schoolId']?[0] != null && params['schoolId']![0] != 'null') {
         schoolId = int.parse(params['schoolId']![0]);
       }
       int? gradeId;
-      if (params['gradeId'] != null && params['gradeId']![0] != null && params['gradeId']![0] != 'null') {
+      if (params['gradeId'] != null && params['gradeId']?[0] != null && params['gradeId']![0] != 'null') {
         gradeId = int.parse(params['gradeId']![0]);
       }
       return QuickDataCheckPage(jobId: jobId, className: className,schoolId:schoolId,gradeId:gradeId);