Merge branch 'zentaopms_263_bug#30003' into 'master'

* Fix bug #30003.

See merge request easycorp/zentaopms!6264
This commit is contained in:
王怡栋
2022-11-21 05:25:28 +00:00
+8 -1
View File
@@ -7558,7 +7558,6 @@ class upgradeModel extends model
$projectID = $this->dao->lastInsertId();
$this->action->create('project', $projectID, 'openedbysystem');
if($project->status == 'closed') $this->action->create('project', $projectID, 'closedbysystem');
$project->id = $projectID;
@@ -7568,6 +7567,14 @@ class upgradeModel extends model
$this->processMergedData($programID, $projectID, '', $productIdList, array($sprint->id));
if($fromMode == 'classic') $this->dao->update(TABLE_PROJECT)->set('multiple')->eq('0')->where('id')->eq($sprint->id)->exec();
$this->dao->update(TABLE_ACTION)
->set('objectID')->eq($projectID)
->set('objectType')->eq('project')
->set('execution')->eq('0')
->set('project')->eq($projectID)
->where('objectType')->eq('execution')
->andWhere('objectID')->eq($sprint->id)
->exec();
}
$this->fixProjectPath($programID);