From 64c73fe1a208d0f0f441057e1fe0bd07cd9041f2 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Sat, 14 Jun 2025 17:13:22 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/SakaiController.php |  8 +++++++-
 app/Models/Book.php                      | 16 +++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index e92fefeb..d4f227cb 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -325,7 +325,13 @@ class SakaiController
         $s = "no 8";
         $s = "thisRag 1122";
         
-        $s = "back";
+        $s = "no 1";
+        $s = "toBlock 111";
+        $s = "sort rank block";
+        $s = "unsort";
+        
+        
+        
 //        $s = "";
 //        $s = "no 5";
 //        $s = "back";
diff --git a/app/Models/Book.php b/app/Models/Book.php
index 206c0f4f..f5310e6b 100755
--- a/app/Models/Book.php
+++ b/app/Models/Book.php
@@ -96,12 +96,14 @@ class Book extends Model
                 
             } else if ($oParentRag->type == "todo") {
                 
-                $sTodoShowRank = BookOption::_hit("todo_show_rank");
-                $aTodoShowRank = explode(",", $sTodoShowRank);
-                $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) {
-                                  $query->whereIn("rank", $aTodoShowRank)
-                                        ->orWhereNull("rank");
-                              });
+                if (!isset($oParentRag->sort) && !isset($oParentRag->like)) {
+                    $sTodoShowRank = BookOption::_hit("todo_show_rank");
+                    $aTodoShowRank = explode(",", $sTodoShowRank);
+                    $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) {
+                                      $query->whereIn("rank", $aTodoShowRank)
+                                            ->orWhereNull("rank");
+                                  });
+                }
                 
             }
             
@@ -112,7 +114,7 @@ class Book extends Model
             } else {
                 
                 if ($oParentRag->sort) {
-                    
+//                    tomd(11, 1);
                     $aSort = explode("_", $oParentRag->sort);
                     $oSelf = $oSelf->where($aSort[0], $aSort[1]);