From 9d24a593cb6d23bc1c7736c88f716f965fb2d8b9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 11 Mar 2020 00:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 2 +-
 app/models/shixun.rb                  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 54eb19474..3f202c994 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -154,7 +154,7 @@ class ShixunsController < ApplicationController
 			@can_fork = {can_fork: "已经职业认证的教师才能fork实训",
 									 certi_url: "/account/certification"}
     end
-		@current_myshixun = @shixun.current_myshixun(current_user)
+		@current_myshixun = @shixun.current_myshixun(current_user.id)
 		if @shixun.fork_from
 			fork_shixun = Shixun.select(:id, :user_id, :name, :identifier).where(id: @shixun.fork_from).first
 			@fork_from = {name: fork_shixun.name, username: fork_shixun.owner.try(:full_name),
diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index b9bd372b0..5caacebce 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -210,9 +210,8 @@ class Shixun < ApplicationRecord
   end
 
   # 当前用户开启的实训
-  def current_myshixun(user)
-    return nil unless user.logged?
-    myshixuns.find_by(user_id: user.id)
+  def current_myshixun(user_id)
+    myshixuns.find_by(user_id: user_id)
   end
 
   # 实训技术平台