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-11 14:19:31 +08:00
parent 47f3ac536b
commit ec9f672666
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,6 +310,8 @@ class SakaiController
$s = "openRe"; $s = "openRe";
$s = "fire__2 2025-06-20"; $s = "fire__2 2025-06-20";
$s = "fire_toggle"; $s = "fire_toggle";
$s = "no 7";
$s = "openRe";
// $s = "detail__all 1"; // $s = "detail__all 1";
// $s = "noRe"; // $s = "noRe";
// $s = "rag xxx"; // $s = "rag xxx";

22
app/Models/Book.php
View File

@ -84,7 +84,18 @@ class Book extends Model
if ($iPage !== "all") { if ($iPage !== "all") {
// sort覆盖特殊规则 // 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); $aSort = explode("_", $oParentRag->sort);
$oSelf = $oSelf->where($aSort[0], $aSort[1]); $oSelf = $oSelf->where($aSort[0], $aSort[1]);
@ -99,20 +110,11 @@ class Book extends Model
$sTodoShowRank = BookOption::_hit("todo_show_rank"); $sTodoShowRank = BookOption::_hit("todo_show_rank");
$aTodoShowRank = explode(",", $sTodoShowRank); $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) { $oSelf = $oSelf->where(function($query) use ($aTodoShowRank) {
$query->whereIn("rank", $aTodoShowRank) $query->whereIn("rank", $aTodoShowRank)
->orWhereNull("rank"); ->orWhereNull("rank");
}); });
// $oSelf = $oSelf->where("rank", "!=", "done");
// $oSelf = $oSelf->where("rank", "!=", "block");
} }
} }