From 8950bafb188f45c87dc2eb488cf358f38c7e56f0 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 1 Apr 2019 10:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=9E=E8=AE=AD=20'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 95d19d93..83ec54f8 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -1115,7 +1115,7 @@ class ShixunsController < ApplicationController
       g.delete_project(@shixun.gpid) if @shixun.try(:gpid).present?
       apply_record = ApplyAction.where(:container_id => @shixun.id, :container_type => "ApplyShixun")
       apply_record.delete_all if apply_record
-      HomeworkCommonsShixuns.where(:shixun_id => @shixun).delete_all # 关联删报错，后续解决
+      #HomeworkCommonsShixuns.where(:shixun_id => @shixun).delete_all # 关联删报错，后续解决
       @shixun.update_attribute(:status, -1)
       respond_to do |format|
         if params[:come_from] == "admin"