diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index fa74a9bd..6aed61b0 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -310,6 +310,8 @@ class SakaiController
         $s = "openRe";
         $s = "fire__2 2025-06-20";
         $s = "fire_toggle";
+        $s = "no 7";
+        $s = "openRe";
 //        $s = "detail__all 1";
 //        $s = "noRe";
 //        $s = "rag xxx";
diff --git a/app/Models/Book.php b/app/Models/Book.php
index 2d44f566..81edc5b7 100755
--- a/app/Models/Book.php
+++ b/app/Models/Book.php
@@ -84,7 +84,18 @@ class Book extends Model
         if ($iPage !== "all") {
             
             // sort覆盖特殊规则
-            if ($oParentRag->sort) {
+            if ($oParentRag->type == "todo_sort") {
+                
+                if (!empty($oParentRag->sort)) {
+                    
+                    $aSort = explode("_", $oParentRag->sort);
+                    self::where("path", $sPath)->where("is_del", $iIsDel);
+                    $oSelf = $oSelf->orWhere("path", $oParentRag->path);
+                    $oSelf = $oSelf->where($aSort[0], $aSort[1]);
+                    
+                }
+                
+            } else if ($oParentRag->sort) {
                 
                 $aSort = explode("_", $oParentRag->sort);
                 $oSelf = $oSelf->where($aSort[0], $aSort[1]);
@@ -99,20 +110,11 @@ class Book extends Model
                     
                     $sTodoShowRank = BookOption::_hit("todo_show_rank");
                     $aTodoShowRank = explode(",", $sTodoShowRank);
-//                    $aTodoShowRank = [done];
-//                    tomd($aTodoShowRank, 1);
-//                    $oSelf = self::where("path", $sPath)->where("is_del", $iIsDel);
-//                    $oSelf = $oSelf->whereIn("rank", $aTodoShowRank);
-//                    $oSelf = $oSelf->orWhereNull("rank");
-//                    $oSelf = self::where("path", $sPath)->where("is_del", $iIsDel);
                     $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) {
                                       $query->whereIn("rank", $aTodoShowRank)
                                             ->orWhereNull("rank");
                                   });
-
                     
-//                    $oSelf = $oSelf->where("rank", "!=", "done");
-//                    $oSelf = $oSelf->where("rank", "!=", "block");
                 }
                 
             }