From 7bce3201137d4f14af728111190a241add1afcf0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Feb 2023 16:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_query.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 076ecddfd..82d612375 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -11,11 +11,7 @@ class Projects::ListQuery < ApplicationQuery end def call - collection = Project.visible - # 增加私有组织中项目过滤 - collection = collection.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id") - .where("organization_extensions.visibility is null or organization_extensions.visibility in (0,1)") - .where("projects.user_id > 0") + collection = main_collection collection = filter_projects(collection) sort = params[:sort_by] || "updated_on" @@ -56,7 +52,8 @@ class Projects::ListQuery < ApplicationQuery else items = items.by_name_or_identifier(params[:search]) end - items.or(items.where(user_id: Owner.like(params[:search]).pluck(:id))) + items.or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) + end def by_project_type(items)