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 = "thisRag 1122";
$s = "back";
$s = "no 1";
$s = "toBlock 111";
$s = "sort rank block";
$s = "unsort";
// $s = "";
// $s = "no 5";
// $s = "back";

16
app/Models/Book.php
View File

@ -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]);