From cb7d6e40ec3443b587813eaf94a0915ebd1859bf Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 2 Jan 2020 13:46:11 +0800 Subject: [PATCH] 1 --- app/controllers/graduation_topics_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb index de707d7c7..203f18b35 100644 --- a/app/controllers/graduation_topics_controller.rb +++ b/app/controllers/graduation_topics_controller.rb @@ -170,11 +170,12 @@ class GraduationTopicsController < ApplicationController teacher_group = @course.teacher_course_groups.where(:user_id => @graduation_topic.tea_id, :id => params[:group_id]).first unless teacher_group.present? member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first - tip_exception("分班名称不能为空") if params[:course_group_name].blank? - course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id) - teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id), - :user_id => @graduation_topic.tea_id, - :course_group_id => course_group.try(:id)) + if params[:course_group_name].present? + course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id) + teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id), + :user_id => @graduation_topic.tea_id, + :course_group_id => course_group.try(:id)) + end end student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first student_member.update_attributes(:course_group_id => teacher_group.course_group_id) if student_member.present?