diff --git a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/api/user/UserProjectResource.kt b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/api/user/UserProjectResource.kt index 3faea6cd8b3..e8f127c08cd 100644 --- a/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/api/user/UserProjectResource.kt +++ b/src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/api/user/UserProjectResource.kt @@ -89,10 +89,7 @@ interface UserProjectResource { sortType: ProjectSortType?, @Parameter(description = "排序规则", required = false) @QueryParam("collation") - collation: ProjectCollation?, - @Parameter(description = "是否查询授权相关项目", required = false) - @QueryParam("queryAuthorization") - queryAuthorization: Boolean? + collation: ProjectCollation? ): Result> @GET diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt index 2973270a59a..5dc5d7e84de 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/resources/UserProjectResourceImpl.kt @@ -69,8 +69,7 @@ class UserProjectResourceImpl @Autowired constructor( enabled: Boolean?, unApproved: Boolean?, sortType: ProjectSortType?, - collation: ProjectCollation?, - queryAuthorization: Boolean? + collation: ProjectCollation? ): Result> { return Result( projectService.list( @@ -79,8 +78,7 @@ class UserProjectResourceImpl @Autowired constructor( enabled = enabled, unApproved = unApproved ?: false, sortType = sortType ?: ProjectSortType.PROJECT_NAME, - collation = collation ?: ProjectCollation.DEFAULT, - queryAuthorization = queryAuthorization + collation = collation ?: ProjectCollation.DEFAULT ) ) } diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt index 4c1452278e3..c59da263686 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectService.kt @@ -164,9 +164,7 @@ interface ProjectService { enabled: Boolean? = null, unApproved: Boolean, sortType: ProjectSortType? = null, - collation: ProjectCollation? = null, - // 获取授权相关项目(主要用于个人视角界面) - queryAuthorization: Boolean? = false + collation: ProjectCollation? = null ): List fun listProjectsForApply( diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt index e55810067ab..2082ee0b77a 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt @@ -32,7 +32,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.tencent.bk.audit.annotations.ActionAuditRecord import com.tencent.bk.audit.annotations.AuditInstanceRecord import com.tencent.bk.audit.context.ActionAuditContext -import com.tencent.devops.auth.api.service.ServiceProjectAuthResource import com.tencent.devops.common.api.enums.SystemModuleEnum import com.tencent.devops.common.api.exception.ErrorCodeException import com.tencent.devops.common.api.exception.InvalidParamException @@ -810,8 +809,7 @@ abstract class AbsProjectServiceImpl @Autowired constructor( enabled: Boolean?, unApproved: Boolean, sortType: ProjectSortType?, - collation: ProjectCollation?, - queryAuthorization: Boolean? + collation: ProjectCollation? ): List { val startEpoch = System.currentTimeMillis() var success = false @@ -821,17 +819,6 @@ abstract class AbsProjectServiceImpl @Autowired constructor( userId = userId, accessToken = accessToken ).toMutableSet() - // 获取授权相关项目,主要用于个人视角权限管理 - if (queryAuthorization == true) { - val projectWithAuthorization = try { - client.get(ServiceProjectAuthResource::class).listUserProjects(userId).data ?: emptyList() - } catch (ex: Exception) { - emptyList() - } - projectsWithVisitPermission.apply { - this.addAll(projectWithAuthorization) - } - } if (projectsWithVisitPermission.isEmpty() && !unApproved) { return emptyList()