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

* Fix bug #27929.

Browse Source
This commit is contained in:
wangyuting2
2022-09-28 06:59:18 +00:00
parent 54526092d4
commit f9310ade48
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+11 -2
View File
@@ -847,11 +847,16 @@ class customModel extends model
->andWhere('acl')->eq('program')
->fetchGroup('parent', 'id');
$programs = $this->dao->select("id,CONCAT(PM,',',openedBy)")->from(TABLE_PROGRAM)
$programPM = $this->dao->select("id,PM")->from(TABLE_PROGRAM)
->where('id')->in(array_keys($projectGroup))
->andWhere('type')->eq('program')
->fetchPairs();
$stakeholders = $this->dao->select('*')->from(TABLE_STAKEHOLDER)
->where('objectType')->eq('program')
->andWhere('objectID')->in(array_keys($projectGroup))
->fetchGroup('objectID', 'user');
$projectIDList = array();
foreach($projectGroup as $projects) $projectIDList = array_merge($projectIDList, array_keys($projects));
$executionGroup = $this->dao->select('project,id')->from(TABLE_EXECUTION)->where('project')->in($projectIDList)->fetchGroup('project', 'id');
@@ -863,7 +868,11 @@ class customModel extends model
{
foreach($projects as $project)
{
$whitelist = rtrim($project->whitelist . ',' . zget($programs, $project->parent, ''));
$PM = zget($programPM, $project->parent, '');
$stakeholder = zget($stakeholders, $project->parent, '');
if($stakeholder) $stakeholder = join(',', array_keys($stakeholder));
$whitelist = rtrim($project->whitelist . ',' . $PM . ',' . $stakeholder);
$whitelist = explode(',', $whitelist);
$whitelist = array_filter(array_unique($whitelist));
$whitelist = join(',', $whitelist);