Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/graduation_topics_controller.rb

@@ -140,8 +140,8 @@ class GraduationTopicsController < ApplicationController
         update_graduation_topic_status
 
         # 拒绝后将该学生移动到未分班中
-        student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
+        # student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
-        student_member.update_attributes(:course_group_id => 0) if student_member.present?
+        # student_member.update_attributes(:course_group_id => 0) if student_member.present?
 
         student_graduation_topic.tidings.update_all(:status => 1)
         Tiding.create(:user_id => student_graduation_topic.user_id, :trigger_user_id => current_user.id,

app/controllers/homework_commons_controller.rb

@@ -194,7 +194,7 @@ class HomeworkCommonsController < ApplicationController
         # TODO user_extension 如果修改 请调整
         unless params[:search].blank?
           @student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
-                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
+                         or student_id like ?", "%#{params[:search].strip}%", "%#{params[:search].strip}%")
         end
 
         @work_count = @student_works.size

db/migrate/20200102030946_modify_course_group_for_courses.rb

@@ -11,7 +11,7 @@ class ModifyCourseGroupForCourses < ActiveRecord::Migration[5.2]
           cg.attachment_group_settings.update_all(course_group_id: g.id)
           cg.homework_group_reviews.update_all(course_group_id: g.id)
           cg.homework_group_settings.update_all(course_group_id: g.id)
-          cg.teacher_course_groups.update_all(course_group_id: g.id)
+          #cg.teacher_course_groups.update_all(course_group_id: g.id)
           cg.destroy!
         end
       end