diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index 580268de..3cdc1b95 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -304,7 +304,7 @@ class SakaiController
         $s = "optionSet todo_show_type 1";
         $s = "openRe";
 //        $s = "back";
-        $s = "todoShowType AB";
+//        $s = "todoShowType AB";
 //        $s = "type todo";
         
         // movetoId和like列表
diff --git a/app/Models/Book.php b/app/Models/Book.php
index 73c23800..e6f9eb45 100755
--- a/app/Models/Book.php
+++ b/app/Models/Book.php
@@ -96,14 +96,22 @@ class Book extends Model
                 }
                 
                 if ($oParentRag->type == "todo") {
-                    $oSelf = $oSelf->where("rank", "!=", "done");
-                    $oSelf = $oSelf->where("rank", "!=", "block");
+                    
+                    $sTodoShowRank = BookOption::_hit("todo_show_rank");
+                    $aTodoShowRank = explode(",", $sTodoShowRank);
+//                    tomd($aTodoShowRank, 1);
+                    $oSelf = $oSelf->whereIn("rank", $aTodoShowRank);
+                    
+//                    $oSelf = $oSelf->where("rank", "!=", "done");
+//                    $oSelf = $oSelf->where("rank", "!=", "block");
                 }
                 
             }
             
         }
         
+        
+        // order
         if ($oParentRag->order == "rank_todo") {
             
             $sTodoOrder = BookOption::_hit("order_rank_todo");
diff --git a/app/Services/TG/Hook/Mod/Book.php b/app/Services/TG/Hook/Mod/Book.php
index fae031f7..f29a7621 100644
--- a/app/Services/TG/Hook/Mod/Book.php
+++ b/app/Services/TG/Hook/Mod/Book.php
@@ -912,9 +912,7 @@ class Book extends Base {
         $aParentType = $this->_typeFormat($oParentRag->type);
         
         if ($aParentType[0] == "todo") {
-//            if (isset($aParentType[1])) {
-//                $oBook->status = $aParentType[0]."_".$aParentType[1];
-//            }
+            $mCustom = $mCustom ? $mCustom : "none";
             if (empty($oBook->rank)) {
                 $oBook->rank = $mCustom;
             }