Browse Source

更改:用户管理的项目需包括admin团队下的

pull/343/head
yystopf 3 years ago
parent
commit
5226196f4e
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      app/queries/projects/list_my_query.rb

+ 1
- 1
app/queries/projects/list_my_query.rb View File

@@ -36,7 +36,7 @@ class Projects::ListMyQuery < ApplicationQuery
projects = projects.where(id: fork_ids)
elsif params[:category].to_s == "admin"
normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: "owner"},team_users: {user_id: user.id}).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: %w(owner admin)},team_users: {user_id: user.id}).to_sql
projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
# elsif params[:category].to_s == "public"
# projects = projects.visible.joins(:members).where(members: { user_id: user.id })


Loading…
Cancel
Save