feat：推荐版本号优化 TencentBlueKing#10958 推荐版本号返回上次构建值

royalhuang · Sep 20, 2024 · 99e6e9c · 99e6e9c
1 parent dad4e00
commit 99e6e9c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryVersionService.kt b/...main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryVersionService.kt
@@ -107,17 +107,17 @@ class PipelineRepositoryVersionService(
         val pipelineVersionLock = PipelineVersionLock(redisOperation, pipelineId, version)
         try {
             pipelineVersionLock.lock()
-            val count = pipelineBuildDao.countBuildNumByVersion(
-                dslContext = dslContext,
-                projectId = projectId,
-                pipelineId = pipelineId,
-                version = version
-            )
-            if (count > 0) {
-                throw ErrorCodeException(
-                    errorCode = ProcessMessageCode.ERROR_PIPELINE_CAN_NOT_DELETE_WHEN_HAVE_BUILD_RECORD
-                )
-            }
+//            val count = pipelineBuildDao.countBuildNumByVersion(
+//                dslContext = dslContext,
+//                projectId = projectId,
+//                pipelineId = pipelineId,
+//                version = version
+//            )
+//            if (count > 0) {
+//                throw ErrorCodeException(
+//                    errorCode = ProcessMessageCode.ERROR_PIPELINE_CAN_NOT_DELETE_WHEN_HAVE_BUILD_RECORD
+//                )
+//            }
             dslContext.transaction { t ->
                 val transactionContext = DSL.using(t)
                 // #8161 软删除数据，前端无法查询到该版本

diff --git a/...s/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt b/...s/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineBuildFacadeService.kt
@@ -258,7 +258,7 @@ class PipelineBuildFacadeService(
                 param.value = if (param.constant == true) {
                     param.readOnly = true
                     param.defaultValue
-                } else if (!param.required || !recommendVersionKey(param.id)) {
+                } else if (!param.required && !recommendVersionKey(param.id)) {
                     param.defaultValue
                 } else if (param.defaultValue is Boolean) {
                     realValue?.toString()?.toBoolean()