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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/191_tianshujie_fixbug

Browse Source
This commit is contained in:
tianshujie
2022-05-20 08:40:49 +08:00
parent 3b98d078af 0fa2c55ece
commit 3742cf99d0
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+21 -8
View File
@@ -906,7 +906,7 @@ class projectModel extends model
* @access public
* @return array
*/
public function getPairsByModel($model = 'all', $programID = 0, $param = '', $append = '')
public function getPairsByModel($model = 'all', $programID = 0, $param = '', $append = '', $orderBy = 'order_asc')
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
@@ -920,7 +920,7 @@ class projectModel extends model
->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!empty($append))->orWhere('id')->in($append)->fi()
->orderBy('id_desc')
->orderBy($orderBy)
->fetchAll();
$programIdList = array();
@@ -932,16 +932,29 @@ class projectModel extends model
$projectProgram[$project->id] = $programID;
}
$programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('id')->in($programIdList)->fetchPairs('id', 'name');
$pairs = array();
$programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('id')->in($programIdList)->orderBy($orderBy)->fetchPairs('id', 'name');
/* Sort by project order in the program list. */
$allProjects = array();
foreach($programs as $programID => $program) $allProjects[$programID] = array();
foreach($projects as $project)
{
$projectName = $project->name;
$programID = zget($projectProgram, $project->id, '');
if($programID != $project->id) $projectName = zget($programs, $programID, '') . ' / ' . $projectName;
$allProjects[$programID][] = $project;
}
$pairs[$project->id] = $projectName;
$pairs = array();
foreach($allProjects as $programID => $projects)
{
foreach($projects as $project)
{
$projectName = $project->name;
$programID = zget($projectProgram, $project->id, '');
if($programID != $project->id) $projectName = zget($programs, $programID, '') . ' / ' . $projectName;
$pairs[$project->id] = $projectName;
}
}
return $pairs;