Merge pull request TencentBlueKing#10136 from yjieliang/bug-10095

bug:解决stage审核参数值类型不一致问题 TencentBlueKing#10095
yjieliang · Jun 3, 2024 · 37fe837 · 37fe837
2 parents 111d4fe + a99db1b
commit 37fe837
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/...src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/atom/ManualReviewParam.kt b/...src/main/kotlin/com/tencent/devops/common/pipeline/pojo/element/atom/ManualReviewParam.kt
@@ -37,7 +37,7 @@ data class ManualReviewParam(
     @get:Schema(title = "参数名", required = true)
     var key: String = "",
     @get:Schema(title = "参数内容(Any 类型)", required = true, type = "string")
-    var value: Any? = "",
+    var value: Any? = null,
     @get:Schema(title = "参数类型", required = false)
     val valueType: ManualReviewParamType = ManualReviewParamType.STRING,
     @get:Schema(title = "是否必填", required = true)

diff --git a/...rc/main/kotlin/com/tencent/devops/process/engine/service/record/BaseBuildRecordService.kt b/...rc/main/kotlin/com/tencent/devops/process/engine/service/record/BaseBuildRecordService.kt
@@ -57,6 +57,7 @@ import com.tencent.devops.process.engine.dao.PipelineResourceDao
 import com.tencent.devops.process.engine.dao.PipelineResourceVersionDao
 import com.tencent.devops.process.engine.pojo.event.PipelineBuildWebSocketPushEvent
 import com.tencent.devops.process.engine.service.PipelineElementService
+import com.tencent.devops.process.engine.utils.PipelineUtils
 import com.tencent.devops.process.pojo.BuildStageStatus
 import com.tencent.devops.process.pojo.pipeline.record.BuildRecordModel
 import com.tencent.devops.process.pojo.pipeline.record.BuildRecordStage
@@ -189,6 +190,9 @@ open class BaseBuildRecordService(
         return try {
             watcher.start("fillElementWhenNewBuild")
             val fullModel = JsonUtil.to(resourceStr, Model::class.java)
+            fullModel.stages.forEach {
+                PipelineUtils.transformUserIllegalReviewParams(it.checkIn?.reviewParams)
+            }
             val baseModelMap = JsonUtil.toMutableMap(bean = fullModel, skipEmpty = false)
             val mergeBuildRecordParam = MergeBuildRecordParam(
                 projectId = projectId,

diff --git a/...process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt b/...process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt
@@ -118,6 +118,15 @@ object PipelineUtils {
         }
     }
 
+    fun transformUserIllegalReviewParams(reviewParams: List<ManualReviewParam>?) {
+        reviewParams?.forEach { param ->
+            val value = param.value
+            if (param.valueType == ManualReviewParamType.MULTIPLE && value is String && value.isBlank()) {
+                param.value = null
+            }
+        }
+    }
+
     private fun checkVariablesLength(key: String, value: String) {
         if (value.length >= PIPELINE_VARIABLES_STRING_LENGTH_MAX) {
             throw ErrorCodeException(