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

Merge branch dev/bug-62906 of zentao/zentaopms (#9038)

Browse Source
This commit is contained in:
刘刚
2025-05-30 10:12:17 +08:00
committed by Gitfox
parent 762f3351d2 eda459a9db
commit 0b3681147b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -1
View File
@@ -1180,7 +1180,11 @@ class actionModel extends model
if($projectIdList) $projectIdList = array_unique($projectIdList);
$parents = array();
if($projectIdList) $parents = $this->dao->select('parent')->from(TABLE_PROJECT)->where('project')->in($projectIdList)->andWhere('deleted')->eq('0')->fetchPairs('parent', 'parent');
if($projectIdList)
{
$parents = $this->dao->select('parent')->from(TABLE_PROJECT)->where('project')->in($projectIdList)->andWhere('deleted')->eq('0')->fetchPairs('parent', 'parent');
$projects = $this->dao->select('id,name,isTpl')->from(TABLE_PROJECT)->where('project')->in($projectIdList)->andWhere('deleted')->eq('0')->fetchAll('id');
}
/* 获取需要验证的元素列表。 */
/* Get the list of elements that need to be verified. */
@@ -1217,6 +1221,7 @@ class actionModel extends model
$this->actionTao->addObjectNameForAction($action, $objectNames, $objectType);
$this->setObjectLink($action, $deptUsers, $shadowProducts, zget($projectMultiples, $projectID, ''));
if($action->objectType == 'execution' && isset($parents[$action->objectID])) $action->objectLink = '';
if($action->objectType == 'project' && !empty($projects[$action->objectID]->isTpl)) $action->objectLabel = $this->lang->project->template;
}
return $actions;
}