diff --git a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt index 6cd6157f42d..be36c7f632c 100644 --- a/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt +++ b/src/backend/ci/core/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt @@ -132,6 +132,9 @@ interface UserAuthResourceGroupResource { @Parameter(description = "项目ID", required = true) @PathParam("projectId") projectId: String, + @Parameter(description = "资源类型", required = true) + @PathParam("resourceType") + resourceType: String, @Parameter(description = "用户组Id") @PathParam("groupId") groupId: Int, diff --git a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt index a875d83f021..fd5ca11b2be 100644 --- a/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt +++ b/src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt @@ -116,6 +116,7 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor( override fun getMemberGroupDetails( userId: String, projectId: String, + resourceType: String, groupId: Int, memberId: String ): Result { @@ -129,8 +130,9 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor( permissionManageFacadeService.getMemberGroupsDetails( projectId = projectId, memberId = memberId, + resourceType = resourceType, iamGroupIds = listOf(groupId) - ).records.first { it.groupId == groupId || it.joinedType == JoinedType.DIRECT } + ).records.first { it.groupId == groupId || it.joinedType == JoinedType.DIRECT } ) }