FIX merge

app/controllers/members_controller.rb

@@ -19,7 +19,7 @@ class MembersController < ApplicationController
     search = params[:search].to_s.downcase
     role = params[:role].to_s
     scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
-    scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role.split(" ")}%") if role.present?
+    scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 
     @total_count = scope.size
     @members = paginate(scope)

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

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
 
   # 学号

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

app/views/members/_member.json.jbuilder

@@ -2,3 +2,4 @@ json.id user.id
 json.name user.real_name
 json.login user.login
 json.image_url url_to_avatar(user)
+json.email user.try(:mail)