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 13:47:53 +08:00
parent e1859d4ab8
commit 47f3ac536b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,6 +303,17 @@ class SakaiController
$s = "toDone 123"; $s = "toDone 123";
$s = "optionSet todo_show_type 1"; $s = "optionSet todo_show_type 1";
$s = "openRe"; $s = "openRe";
$s = "unsort";
$s = "rag asdf";
$s = "toDone zzz";
$s = "toTip zsss";
$s = "openRe";
$s = "fire__2 2025-06-20";
$s = "fire_toggle";
// $s = "detail__all 1";
// $s = "noRe";
// $s = "rag xxx";
// $s = "back"; // $s = "back";
// $s = "todoShowType AB"; // $s = "todoShowType AB";
// $s = "type todo"; // $s = "type todo";

7
app/Models/Book.php
View File

@ -124,10 +124,11 @@ class Book extends Model
if ($oParentRag->order == "rank_todo") { if ($oParentRag->order == "rank_todo") {
$sTodoOrder = BookOption::_hit("order_rank_todo"); $sTodoOrder = BookOption::_hit("order_rank_todo");
$aOrder = explode(",", $sTodoOrder); $aTodoOrder = explode(",", $sTodoOrder);
$sTodoOrder = implode(",", array_reverse($aTodoOrder));
$oSelf = $oSelf->orderByRaw("rank IS NULL, FIELD(rank, " . $sTodoOrder . ") ".$sOrderType); $oSelf = $oSelf->orderByRaw("FIELD(rank, " . $sTodoOrder . ") DESC, (rank IS NULL) ASC");
$oSelf = $oSelf->orderByRaw("fire IS NULL, fire ASC"); $oSelf = $oSelf->orderByRaw("fire DESC, (fire IS NULL) ASC");
$sOrder = "no"; $sOrder = "no";
$sOrderType = "asc"; $sOrderType = "asc";

2
app/Services/TG/Hook/Mod/Book.php
View File

@ -1077,7 +1077,7 @@ class Book extends Base {
} }
// 私有 // 私有
private function noRe() public function noRe()
{ {
// $oBook = ModelBook::where("path", $this->sPath)->where("is_del", 0)->orderBy("no")->orderBy("updated_at", "desc")->get(); // $oBook = ModelBook::where("path", $this->sPath)->where("is_del", 0)->orderBy("no")->orderBy("updated_at", "desc")->get();
$oBook = ModelBook::_path($this->sPath, "all"); $oBook = ModelBook::_path($this->sPath, "all");