Merge branch 'sprint/196' into 'master'

Sprint/196

See merge request easycorp/zentaopms!3677
This commit is contained in:
王怡栋
2022-06-01 02:28:26 +00:00
19 changed files with 174 additions and 34 deletions
+3 -2
View File
@@ -52,8 +52,9 @@ class program extends control
}
else
{
$topPrograms = $this->program->getList($status, $orderBy, $pager, 'top');
$programs = $this->program->getList($status, $orderBy, null, 'child', $topPrograms);
/* Get pager for top program and projects whithout program. */
$this->program->getList($status, $orderBy, $pager, 'top');
$programs = $this->program->getList($status, $orderBy);
/* Get summary. */
$topCount = $indCount = 0;