diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c97be34fb..ba00b0a5c 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -747,7 +747,7 @@ class CoursesController < ApplicationController ActiveRecord::Base.transaction do course_student.destroy! course_teacher.update!(is_active: 1) - TeacherCourseGroup.create!(user_id: current_user.id, course_id: @course.id, group_id: course_student.course_group_id) + TeacherGroupRecord.create!(user_id: current_user.id, course_id: @course.id, group_id: course_student.course_group_id) CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id]) end normal_status(0, "切换成功") @@ -767,7 +767,7 @@ class CoursesController < ApplicationController ActiveRecord::Base.transaction do course_student.destroy! course_teacher.update!(is_active: 1) - TeacherCourseGroup.create!(user_id: current_user.id, course_id: @course.id, group_id: course_student.course_group_id) + TeacherGroupRecord.create!(user_id: current_user.id, course_id: @course.id, group_id: course_student.course_group_id) CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id]) end normal_status(0, "切换成功") @@ -790,7 +790,7 @@ class CoursesController < ApplicationController course_student.update_attributes!(is_active: 1) else # 学生身份不存在则创建 - course_group_id = @course.teacher_course_groups.find_by(user_id: current_user.id)&.group_id.to_i + course_group_id = @course.teacher_group_records.find_by(user_id: current_user.id)&.group_id.to_i course_group_id = @course.course_groups.find_by(id: course_group_id)&.id.to_i CourseMember.create!(user_id: current_user.id, role: 4, course_id: @course.id, course_group_id: course_group_id) CourseAddStudentCreateWorksJob.perform_later(@course.id, [current_user.id]) diff --git a/app/models/course.rb b/app/models/course.rb index 7e795ff04..2c76f9579 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -95,7 +95,7 @@ class Course < ApplicationRecord has_many :course_attendance_groups has_many :course_member_attendances - has_many :teacher_course_groups, dependent: :destroy + has_many :teacher_group_records, dependent: :destroy validate :validate_sensitive_string diff --git a/app/models/user.rb b/app/models/user.rb index bdd7fc42a..7e60983d1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -160,7 +160,7 @@ class User < ApplicationRecord has_many :examination_banks, dependent: :destroy has_many :examination_intelligent_settings, dependent: :destroy - has_many :teacher_course_groups, dependent: :destroy + has_many :teacher_group_records, dependent: :destroy # Groups and active users scope :active, lambda { where(status: STATUS_ACTIVE) }