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

* Finish task #61975.

Browse Source
This commit is contained in:
liumengyi
2022-07-26 09:34:59 +08:00
parent 13991e6250
commit 6958fefc27
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/personnel/model.php
+12 -9
View File
@@ -479,17 +479,20 @@ class personnelModel extends model
if($objectType == 'sprint')
{
$parentID = 0;
if($this->config->systemMode == 'new') $parentID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($objectID)->fetch('project');
if($this->config->systemMode == 'new')
{
$this->loadModel('execution');
$execution = $this->execution->getByID($objectID);
$parentID = $execution->project;
$project = $this->execution->getByID($parentID);
$objects = array($project->id => $project->name);
}
$objects = $this->dao->select('id,name')->from(TABLE_EXECUTION)
->where('(project')->eq($parentID)
->orWhere('id')->eq($parentID)
->markRight(1)
->andWhere('(id')->in($this->app->user->view->projects)
->orWhere('id')->in($this->app->user->view->sprints)
->markRight(1)
$objects += $this->dao->select('id,name')->from(TABLE_EXECUTION)
->where('project')->eq($parentID)
->andWhere('id')->in($this->app->user->view->sprints)
->andWhere('deleted')->eq(0)
->orderBy('type_asc,openedDate_desc')
->orderBy('openedDate_desc')
->limit('10')
->fetchPairs();
foreach($objects as $id => &$object)