Merge branch 'issue_4531' into issue_4732

royalhuang · Aug 19, 2021 · 5a7b12b · 5a7b12b
2 parents 946e723 + 3ea544a
commit 5a7b12b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...ommon-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/StagePauseCheck.kt b/...ommon-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/StagePauseCheck.kt
@@ -169,7 +169,13 @@ data class StagePauseCheck(
             }
         }
         reviewDesc = EnvUtils.parseEnv(reviewDesc, variables)
-        reviewParams?.forEach { it.value = EnvUtils.parseEnv(it.value.toString(), variables) }
+        reviewParams?.forEach {
+            it.value = if (variables.containsKey(it.key)) {
+                variables[it.key]
+            } else {
+                EnvUtils.parseEnv(it.value.toString(), variables)
+            }
+        }
     }
 
     /**