From d040850a3a4aa032222a4e027c7e78f249f9bd80 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 28 Aug 2019 09:41:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/challenges_controller.rb      | 23 +++++++++++--------
 .../challenges/crud_answer.json.jbuilder      |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 0f6532372..48ba77b0c 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -234,18 +234,21 @@ class ChallengesController < ApplicationController
   #   {...}, ...]
   #}
   def crud_answer
-    raise '参考答案不能为空' if params[:challenge_answer].empty?
-    raise '占比之和必须为100%' if params[:challenge_answer].map{|a| a[:score]}.sum != 100
-    ActiveRecord::Base.transaction do
-      @challenge.challenge_answers.destroy_all if @challenge.challenge_answers
-      params[:challenge_answer].each_with_index do |answer, index|
-        # 内容为空不保存
-        next if answer[:contents].blank?
-        ChallengeAnswer.create(name: answer[:name], contents: answer[:contents],
-                               level: index+1, score: answer[:score], challenge_id: @challenge.id)
+    if @challenge.challenge_answers && params[:challenge_answer].empty?
+      @challenge.challenge_answers.destroy_all
+    else
+      raise '参考答案不能为空' if params[:challenge_answer].empty?
+      raise '占比之和必须为100%' if params[:challenge_answer].map{|a| a[:score]}.sum != 100
+      ActiveRecord::Base.transaction do
+        @challenge.challenge_answers.destroy_all if @challenge.challenge_answers
+        params[:challenge_answer].each_with_index do |answer, index|
+          # 内容为空不保存
+          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
-
   end
 
   # 查看参考答案接口
diff --git a/app/views/challenges/crud_answer.json.jbuilder b/app/views/challenges/crud_answer.json.jbuilder
index b11268d99..e16f09423 100644
--- a/app/views/challenges/crud_answer.json.jbuilder
+++ b/app/views/challenges/crud_answer.json.jbuilder
@@ -1,2 +1,2 @@
 json.status 1
-json.message "创建参考答案成功"
\ No newline at end of file
+json.message "操作成功"
\ No newline at end of file

From 7b988654cb9a70adf7e981b5a5a9ebe2053c7e15 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 28 Aug 2019 09:45:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/challenges_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 48ba77b0c..8cb68b1d4 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -234,7 +234,7 @@ class ChallengesController < ApplicationController
   #   {...}, ...]
   #}
   def crud_answer
-    if @challenge.challenge_answers && params[:challenge_answer].empty?
+    if @challenge.challenge_answers && params[:challenge_answer].blank?
       @challenge.challenge_answers.destroy_all
     else
       raise '参考答案不能为空' if params[:challenge_answer].empty?