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

Merge branch dev/task-152105 of zentao/zentaopms (#12334)

Browse Source
This commit is contained in:
刘刚
2025-11-13 16:34:21 +08:00
committed by Gitfox
parent 34fe5fb264 e04c66619b
commit 3b0d778623
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/stage/model.php
+1
View File
@@ -197,6 +197,7 @@ class stageModel extends model
->where('deleted')->eq(0)
->andWhere('workflowGroup')->eq($groupID)
->beginIF($this->config->edition != 'ipd')->andWhere('projectType')->ne('ipd')->fi()
->andWhere('type')->ne('lifecycle')
->orderBy($orderBy)
->fetchAll('id');
module/upgrade/model.php
-1
View File
@@ -12611,7 +12611,6 @@ class upgradeModel extends model
$flowCode = $flow->code;
foreach($stageGroup[$projectModel] as $stage)
{
if($stage->type == 'lifecycle') continue;
if($flowCode == 'tpdproduct' && !in_array($stage->type, $this->config->project->categoryStages['TPD'])) continue;
if($flowCode == 'cbbproduct' && !in_array($stage->type, $this->config->project->categoryStages['CBB'])) continue;
if(in_array($flowCode, array('cpdproduct', 'cpdproject')) && !in_array($stage->type, $this->config->project->categoryStages['CPD'])) continue;