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

Merge branch 'tianshujie_fixbug' into 'master'

Browse Source 
* Fix the problem of no project executing after data merging.

See merge request easycorp/zentaopms!4733
This commit is contained in:
胡方舟
2022-08-01 23:30:14 +00:00
parent 30ef6f2b21 8f62881ec6
commit 5fe8857cae
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+5 -5
View File
@@ -424,7 +424,7 @@ class upgrade extends control
/* Get no merged product and project count. */
$noMergedProductCount = $this->dao->select('count(*) as count')->from(TABLE_PRODUCT)->where('program')->eq(0)->andWhere('vision')->eq('rnd')->fetch('count');
$noMergedSprintCount = $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('grade')->eq(0)->andWhere('vision')->eq('rnd')->andWhere('path')->eq('')->andWhere('type')->ne('program')->andWhere('deleted')->eq(0)->fetch('count');
$noMergedSprintCount = $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('grade')->eq(0)->andWhere('vision')->eq('rnd')->andWhere('project')->eq(0)->andWhere('type')->eq('sprint')->andWhere('deleted')->eq(0)->fetch('count');
/* When all products and projects merged then finish and locate afterExec page. */
if(empty($noMergedProductCount) and empty($noMergedSprintCount))
@@ -559,9 +559,9 @@ class upgrade extends control
if($type == 'sprint')
{
$noMergedSprints = $this->dao->select('*')->from(TABLE_PROJECT)
->where('parent')->eq(0)
->andWhere('path')->eq('')
->where('project')->eq(0)
->andWhere('vision')->eq('rnd')
->andWhere('type')->eq('sprint')
->andWhere('deleted')->eq(0)
->orderBy('id_desc')
->fetchAll('id');
@@ -578,9 +578,9 @@ class upgrade extends control
if($type == 'moreLink')
{
$noMergedSprints = $this->dao->select('*')->from(TABLE_PROJECT)
->where('parent')->eq(0)
->where('project')->eq(0)
->andWhere('vision')->eq('rnd')
->andWhere('path')->eq('')
->andWhere('type')->eq('sprint')
->andWhere('deleted')->eq(0)
->orderBy('id_desc')
->fetchAll('id');