From cd80381510acdac828828756e696010edca99d40 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 11 Mar 2020 17:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=89=88=E6=9C=AC=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 29a9a9730..324d2214e 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -23,22 +23,16 @@ class MyshixunsController < ApplicationController
     end
     begin
       ActiveRecord::Base.transaction do
-        begin
           @shixun = Shixun.select(:id, :identifier, :challenges_count).find(@myshixun.shixun_id)
           @myshixun.destroy!
-          StudentWork.where(:myshixun_id => @myshixun.id).update_all(myshixun_id: 0, work_status: 0, work_score: nil,
-                                                                     final_score: nil, efficiency: 0, eff_score: 0, calculation_time: nil, cost_time: 0, compelete_status: 0)
-        rescue Exception => e
-          logger.error("######reset_my_game_failed:#{e.message}")
-          raise("ActiveRecord::RecordInvalid")
-        end
+
+          StudentWork.where(:myshixun_id => @myshixun.id)
+              .update_all(myshixun_id: 0, work_status: 0, work_score: nil,
+                          final_score: nil, efficiency: 0, eff_score: 0, calculation_time: nil, cost_time: 0, compelete_status: 0)
       end
       # 删除版本库
       GitService.delete_repository(repo_path: @repo_path) unless @shixun.is_choice_type?
     rescue Exception => e
-      if e.message != "ActiveRecord::RecordInvalid"
-        logger.error("######delete_repository_error-:#{e.message}")
-      end
       raise "delete_repository_error:#{e.message}"
     end
   end