Merge pull request #10897 from hejieehe/issue-9620-1

feat：支持管理员查看项目成员 #9620 增加兜底, 避免权限代持信息丢失
TencentBlueKing · Sep 2, 2024 · 0b6a6d1 · 0b6a6d1
2 parents d96cdc6 + bf41f3f
commit 0b6a6d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
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
@@ -205,10 +205,14 @@ class PipelineBuildService(
                 projectVO = projectVO,
                 channelCode = channelCode,
                 isMobile = isMobile,
-                pipelineAuthorizer = pipelineRepositoryService.getPipelineOauthUser(
-                    projectId = pipeline.projectId,
-                    pipelineId = pipeline.pipelineId
-                )
+                pipelineAuthorizer = if (pipeline.channelCode == ChannelCode.BS) {
+                    pipelineRepositoryService.getPipelineOauthUser(
+                        projectId = pipeline.projectId,
+                        pipelineId = pipeline.pipelineId
+                    )
+                } else {
+                    null
+                }
             )
 
             val context = StartBuildContext.init(

diff --git a/...z-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt b/...z-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt
@@ -476,7 +476,7 @@ class SubPipelineStartUpService @Autowired constructor(
             pipelineRepositoryService.getPipelineOauthUser(
                 projectId = parentProjectId,
                 pipelineId = parentPipelineId
-            )
+            ) ?: userId
         } else {
             userId
         }