From 9b302875ed3d090bcdef53977be8b23a4f023345 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 22 May 2020 15:41:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9project=20=E7=9A=84managers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/apply_join_project_notify_job.rb | 2 +- app/models/user.rb | 2 +- app/services/projects/apply_join_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jobs/apply_join_project_notify_job.rb b/app/jobs/apply_join_project_notify_job.rb index fe46bf0e0..23056332b 100644 --- a/app/jobs/apply_join_project_notify_job.rb +++ b/app/jobs/apply_join_project_notify_job.rb @@ -23,7 +23,7 @@ class ApplyJoinProjectNotifyJob < ApplicationJob end Tiding.bulk_insert(*attrs) do |worker| - project.manager_members.each do |manager| + project.managers.each do |manager| worker.add(same_attrs.merge(user_id: manager.user_id)) end end diff --git a/app/models/user.rb b/app/models/user.rb index 859c02986..3d946731e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -130,7 +130,7 @@ class User < ApplicationRecord end def project_manager?(project) - project.manager_members.exists?(user: self) || self.admin? + project.managers.exists?(user: self) || self.admin? end # 学号 diff --git a/app/services/projects/apply_join_service.rb b/app/services/projects/apply_join_service.rb index d14b3dc52..3601ee42c 100644 --- a/app/services/projects/apply_join_service.rb +++ b/app/services/projects/apply_join_service.rb @@ -55,7 +55,7 @@ class Projects::ApplyJoinService < ApplicationService applied_user_id: user.id, role: role_value, project_id: project.id } - project.manager_members.each do |manager| + project.managers.each do |manager| worker.add(base_attr.merge(user_id: manager.user_id)) end end