From 0793702299cd6ab197d742fb62210a78f0559e54 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 16 Jul 2019 11:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- app/models/competition_team.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index dc8f6dea..3a66aff4 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1087,7 +1087,7 @@ end @only_teacher = @competition.competition_staffs.count == 1 && @competition.competition_staffs.first.category == 'teacher' @team_members = @competition.team_members - @team_members = @team_members.where(is_teacher: false) unless @only_teacher # 只有老师报名时才显示老师，此时老师作为队员 + @team_members = @team_members.where("team_members.is_teacher = 0") unless @only_teacher # 只有老师报名时才显示老师，此时老师作为队员 if params[:school] || params[:location] school_ids = School.where("schools.name like '%#{params[:school]}%'").pluck(:id) diff --git a/app/models/competition_team.rb b/app/models/competition_team.rb index 84dcac81..e2551710 100644 --- a/app/models/competition_team.rb +++ b/app/models/competition_team.rb @@ -4,8 +4,8 @@ class CompetitionTeam < ActiveRecord::Base belongs_to :competition has_many :team_members, :dependent => :destroy - has_many :members, conditions: 'is_teacher = 0', class_name: 'TeamMember' - has_many :teachers, conditions: 'is_teacher = 1', class_name: 'TeamMember' + has_many :members, conditions: 'team_members.is_teacher = 0', class_name: 'TeamMember' + has_many :teachers, conditions: 'team_members.is_teacher = 1', class_name: 'TeamMember' has_many :competition_scores, :dependent => :destroy # team_type 0：组队 1：个人 # attr_accessible :invite_code, :name, :team_type