diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index 3f881fd4..580268de 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -304,7 +304,8 @@ class SakaiController
         $s = "optionSet todo_show_type 1";
         $s = "openRe";
 //        $s = "back";
-        $s = "todoShowType 3";
+        $s = "todoShowType AB";
+//        $s = "type todo";
         
         // movetoId和like列表
         
diff --git a/app/Models/Book.php b/app/Models/Book.php
index 43d5b908..64d51e12 100755
--- a/app/Models/Book.php
+++ b/app/Models/Book.php
@@ -95,9 +95,17 @@ class Book extends Model
             
             if ($iPage !== "all") {
                 
-                if (isset($aRagOption["todo_show_type"]) && $aRagOption["todo_show_type"] == 1) {
-                    $oSelf = $oSelf->where("rank", "!=", "done");
-                    $oSelf = $oSelf->where("rank", "!=", "block");
+                if (isset($aRagOption["todo_show_type"])) {
+                    
+                    if ($aRagOption["todo_show_type"] == "A") {
+                        $oSelf = $oSelf->where("rank", "!=", "done");
+                        $oSelf = $oSelf->where("rank", "!=", "block");
+                    } else if ($aRagOption["todo_show_type"] == "B") {
+                        $oSelf = $oSelf->whereIn("rank", ["done", "block"]);
+                    } else if ($aRagOption["todo_show_type"] == "AB") {
+                        
+                    }
+                    
                 }
                 
             }
diff --git a/app/Services/TG/Hook/Mod/Book.php b/app/Services/TG/Hook/Mod/Book.php
index 4f8c8370..2e7bf3cb 100644
--- a/app/Services/TG/Hook/Mod/Book.php
+++ b/app/Services/TG/Hook/Mod/Book.php
@@ -277,7 +277,7 @@ class Book extends Base {
         if ($sType == "todo") {
             $oParentRag->order = "rank_todo";
             $oParentRag->option = json_encode([
-                                              "todo_show_type"  => 1
+                                              "todo_show_type"  => "A"
                                               ]);
         }