Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/challenges_controller.rb

@@ -230,11 +230,16 @@ class ChallengesController < ApplicationController
   def crud_answer
     raise '参考答案不能为空' if params[:challenge_answer].empty?
     raise '占比之和必须为100%' if params[:challenge_answer].map{|a| a[:score]}.sum != 100
-    @challenge.challenge_answers.destroy_all if @challenge.challenge_answers
+    ActiveRecord::Base.transaction do
-    params[:challenge_answer].each_with_index do |answer, index|
+      @challenge.challenge_answers.destroy_all if @challenge.challenge_answers
-      ChallengeAnswer.create(name: answer[:name], contents: answer[:contents],
+      params[:challenge_answer].each_with_index do |answer, index|
-                             level: index+1, score: answer[:score], challenge_id: @challenge.id)
+        # 内容为空不保存
+        next if answer[:contents].blank?
+        ChallengeAnswer.create(name: answer[:name], contents: answer[:contents],
+                               level: index+1, score: answer[:score], challenge_id: @challenge.id)
+      end
     end
+
   end
 
   # 查看参考答案接口

app/controllers/courses_controller.rb

@@ -315,7 +315,7 @@ class CoursesController < ApplicationController
     # @users = User.where.not(id: user_ids_of_course_members)
 
     @users = User.where(status: User::STATUS_ACTIVE)
-    @users = @users.where("concat(users.firstname, users.lastname) like '%#{name}%'") if name.present?
+    @users = @users.where("concat(users.lastname, users.firstname) like '%#{name}%'") if name.present?
     # REDO:Extension
     @users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if school_name.present?
 

app/models/game.rb

@@ -31,7 +31,7 @@ class Game < ApplicationRecord
 
   # 根据得分比例来算实际得分(试卷、实训作业)
   def real_score score
-    (final_score.to_f / challenge.all_score) * score
+    ((final_score < 0 ? 0 : final_score).to_f / challenge.all_score) * score
   end
 
   # 判断实训是否全部通关

app/views/courses/search_teacher_candidate.json.jbuilder

@@ -1,7 +1,7 @@
 json.candidates do
   json.array! @users do |user|
     json.id user.id
-    json.name user.firstname + user.lastname
+    json.name user.real_name
     json.nickname user.nickname
     json.school_name user.user_extension.school.try(:name)
     json.school_id user.user_extension.school.try(:id)