From fc48995990f17e3535c7daefeec9a65237befb73 Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Fri, 16 Sep 2022 06:10:54 +0000 Subject: [PATCH] * Fix noMergedSprints data bug. --- module/upgrade/model.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 3c0858ef43..f084216025 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7747,18 +7747,12 @@ class upgradeModel extends model */ public function getNoMergedSprints() { - $noMergedSprints = $this->dao->select('*')->from(TABLE_PROJECT) + return $this->dao->select('*')->from(TABLE_PROJECT) ->where('project')->eq(0) ->andWhere('vision')->eq('rnd') ->andWhere('type')->eq('sprint') ->andWhere('deleted')->eq(0) ->fetchAll('id'); - - $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($noMergedSprints))->fetchGroup('project', 'product'); - foreach($projectProducts as $sprintID => $products) unset($noMergedSprints[$sprintID]); - - if(empty($noMergedSprints)) return false; - return $noMergedSprints; } /**