From 17f39ee5836113bf66cf104952fd852ad2540cb4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 25 Mar 2020 18:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/project_categories_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 +- app/queries/projects/list_query.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index dcdc8ca7d..13f8056d8 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -8,7 +8,7 @@ class ProjectCategoriesController < ApplicationController if is_admin projects = Project.all elsif current_user&.logged? - projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ) + projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ).distinct else projects = Project.visible end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 508af856c..6417e42da 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -42,7 +42,7 @@ class ProjectsController < ApplicationController if is_admin projects = Project.all elsif current_user&.logged? - projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ) + projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, current_user.id,current_user.id ).distinct else projects = Project.visible end diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index c7189ee85..b5facb3a3 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -13,7 +13,7 @@ class Projects::ListQuery < ApplicationQuery if params[:is_admin] projects = Project.all elsif params[:user_id].to_i != 2 - projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, params[:user_id].to_i,params[:user_id].to_i ) + projects = Project.joins(:members).where.not("projects.is_public = ? and (projects.user_id != ? or members.user_id != ?)", false, params[:user_id].to_i,params[:user_id].to_i ).distinct else projects = Project.visible end