From 78fcc44b03e485d0404dd17a6fbf2cfa02373790 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Mon, 14 Oct 2024 14:24:15 +0800 Subject: [PATCH] * [bug#55962,done,0.5h] order space list. --- module/doc/model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/doc/model.php b/module/doc/model.php index a8bf299724..52d9ab97e1 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1058,6 +1058,7 @@ class docModel extends model ->beginIF($type == 'all')->andWhere('type')->in('mine,custom')->fi() ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi() ->beginIF($type == 'mine')->andWhere('addedBy')->eq($this->app->user->account)->fi() + ->orderBy('type_desc') ->fetchAll(); $pairs = array(); @@ -1130,6 +1131,7 @@ class docModel extends model ->andWhere('type', true)->eq('custom') ->orWhere('(type')->eq('mine')->andWhere('addedBy')->eq($this->app->user->account) ->markRight(2) + ->orderBy('type_desc') ->fetchAll(); $productPairs = $projectPairs = $spacePairs = array(); @@ -1140,7 +1142,7 @@ class docModel extends model if($this->checkPrivLib($space)) $spacePairs["{$space->type}.{$space->id}"] = $this->lang->doc->spaceList[$space->type] . '/' . $space->name; } - return array_merge($productPairs, $projectPairs, $spacePairs); + return array_merge($spacePairs, $productPairs, $projectPairs); } /**