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

Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284

Browse Source
This commit is contained in:
tianshujie
2023-02-16 14:58:53 +08:00
parent a2435c006a ae5dcc21ab
commit 355cf1c597
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/control.php
Regular → Executable
+4 -7
View File
@@ -223,15 +223,12 @@ class company extends control
/* Get executions' list.*/
$executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode|multiple');
$executionsIDList = array_keys($executions);
$executionsList = $this->execution->getByIdList($executionsIDList);
foreach($executionsList as $executionsID => $executionObj)
$executionsList = $this->execution->getByIdList(array_keys($executions));
foreach($executionsList as $executionID => $execution)
{
foreach($projects as $projectsID => $projectsName)
{
if($executionObj->project == $projectsID) $executions[$executionObj->id] = $projectsName . '/' . $executionObj->name;
}
if(isset($projects[$execution->project])) $executions[$execution->id] = $projects[$execution->project] . '/' . $executions[$execution->id];
}
$executions = array($this->lang->execution->common) + $executions;
$this->view->executions = $executions;