diff --git a/module/personnel/model.php b/module/personnel/model.php index d3b541eede..a97a3a69bc 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -134,14 +134,17 @@ class personnelModel extends model $issueInvest = $this->getIssueInvest($accountPairs, $projects); $riskInvest = $this->getRiskInvest($accountPairs, $projects); } - $userPairs = $this->loadModel('user')->getListByAccounts(array_keys($accountPairs), 'account'); - foreach($userPairs as $user) $user->role = zget($this->lang->user->roleList, $user->role, $user->role); + + $users = $this->loadModel('user')->getListByAccounts(array_keys($accountPairs), 'account'); + foreach($users as $user) $user->role = zget($this->lang->user->roleList, $user->role, $user->role); foreach($accountPairs as $account => $projects) { - $personnelList[$account]['realname'] = $userPairs[$account]->realname; + $user = zget($users, $account, ''); + + $personnelList[$account]['realname'] = $user ? $user->realname : $account; $personnelList[$account]['account'] = $account; - $personnelList[$account]['role'] = $userPairs[$account]->role; + $personnelList[$account]['role'] = $user ? $user->role : ''; $personnelList[$account]['projects'] = $projects; $personnelList[$account]['executions'] = zget($executionPairs, $account, 0); diff --git a/module/program/model.php b/module/program/model.php index a465490ad7..ccac058729 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -546,25 +546,19 @@ class programModel extends model while($program = $stmt->fetch()) { - $link = $from == 'program' ? helper::createLink($moduleName, $methodName, "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); + $link = $this->getLink($moduleName, $methodName, $program->id, $vars, $from); $linkHtml = html::a($link, $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id])) { if(!isset($programMenu[$program->parent])) $programMenu[$program->parent] = ''; $programMenu[$program->parent] .= "