Merge pull request TencentBlueKing#10429 from royalhuang/pac_github

feat：流水线版本管理机制 TencentBlueKing#8161 修复传参问题
yjieliang · May 29, 2024 · ff00c8c · ff00c8c
2 parents dd25a9b + 8918d64
commit ff00c8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...rocess/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt b/...rocess/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildDao.kt
@@ -1740,7 +1740,7 @@ class PipelineBuildDao {
                     // queueTime在数据库中必定会写值，不为空，以防万一用当前时间兜底
                     queueTime = t.queueTime?.timestampmilli() ?: LocalDateTime.now().timestampmilli(),
                     startUser = t.startUser,
-                    triggerUser = t.triggerUser,
+                    triggerUser = t.triggerUser ?: t.startUser ?: "",
                     startTime = t.startTime?.timestampmilli(),
                     endTime = t.endTime?.timestampmilli(),
                     taskCount = t.taskCount,
@@ -1802,7 +1802,7 @@ class PipelineBuildDao {
                     status = BuildStatus.values()[t.status],
                     queueTime = t.queueTime?.timestampmilli() ?: 0L,
                     startUser = t.startUser,
-                    triggerUser = t.triggerUser,
+                    triggerUser = t.triggerUser ?: t.startUser ?: "",
                     startTime = t.startTime?.timestampmilli() ?: 0L,
                     endTime = t.endTime?.timestampmilli() ?: 0L,
                     taskCount = t.taskCount,

diff --git a/...-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt b/...-base/src/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineBuildService.kt
@@ -150,7 +150,7 @@ class PipelineBuildService(
             )?.settingVersion?.let {
                 pipelineSettingVersionService.getPipelineSetting(
                     userId = userId,
-                    projectId = pipeline.pipelineId,
+                    projectId = pipeline.projectId,
                     pipelineId = pipeline.pipelineId,
                     detailInfo = null,
                     version = it