tom/dd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
hellcat 2025-06-14 17:13:22 +08:00
parent f19ec26c8f
commit 64c73fe1a2
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/SakaiController.php
View File

@ -325,7 +325,13 @@ class SakaiController
$s = "no 8"; $s = "no 8";
$s = "thisRag 1122"; $s = "thisRag 1122";
$s = "back"; $s = "no 1";
$s = "toBlock 111";
$s = "sort rank block";
$s = "unsort";
// $s = ""; // $s = "";
// $s = "no 5"; // $s = "no 5";
// $s = "back"; // $s = "back";

16
app/Models/Book.php
View File

@ -96,12 +96,14 @@ class Book extends Model
} else if ($oParentRag->type == "todo") { } else if ($oParentRag->type == "todo") {
$sTodoShowRank = BookOption::_hit("todo_show_rank"); if (!isset($oParentRag->sort) && !isset($oParentRag->like)) {
$aTodoShowRank = explode(",", $sTodoShowRank); $sTodoShowRank = BookOption::_hit("todo_show_rank");
$oSelf = $oSelf->where(function($query) use ($aTodoShowRank) { $aTodoShowRank = explode(",", $sTodoShowRank);
$query->whereIn("rank", $aTodoShowRank) $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) {
->orWhereNull("rank"); $query->whereIn("rank", $aTodoShowRank)
}); ->orWhereNull("rank");
});
}
} }
@ -112,7 +114,7 @@ class Book extends Model
} else { } else {
if ($oParentRag->sort) { if ($oParentRag->sort) {
// tomd(11, 1);
$aSort = explode("_", $oParentRag->sort); $aSort = explode("_", $oParentRag->sort);
$oSelf = $oSelf->where($aSort[0], $aSort[1]); $oSelf = $oSelf->where($aSort[0], $aSort[1]);