Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#55962,done,0.5h] order space list.

Browse Source
This commit is contained in:
zhouxin
2024-10-16 08:39:34 +08:00
committed by sunhao
parent 23d76c9cf4
commit 78fcc44b03
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -1
View File
@@ -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);
}
/**