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

* Fix bug.

Browse Source
This commit is contained in:
qiyu-xie
2020-12-11 10:11:38 +08:00
parent ad87de1b23
commit 4696296c91
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+10 -5
View File
@@ -995,11 +995,16 @@ class docModel extends model
if($type == 'product' or $type == 'project')
{
$project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
$orderBy = $project->model == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$fields = $type == 'product' ? "createdBy, createdDate" : "openedBy AS createdBy, openedDate AS createdDate";
$libs = $this->dao->select("id, name, `order`, {$fields}")->from($table)
$orderBy = '`order` desc, id desc';
if($type == 'project')
{
$project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
$orderBy = $project->model == 'waterfall' ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
}
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$fields = $type == 'product' ? "createdBy, createdDate" : "openedBy AS createdBy, openedDate AS createdDate";
$libs = $this->dao->select("id, name, `order`, {$fields}")->from($table)
->where('id')->in($idList)
->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('status')->notin('done,closed')->fi()
->orderBy($orderBy)