From 88eea571bba08cd1db9e25076a4e42dff9543ac0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 14 Feb 2020 17:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_commons/index.json.jbuilder | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/homework_commons/index.json.jbuilder b/app/views/homework_commons/index.json.jbuilder
index db3603746..b80b41b8f 100644
--- a/app/views/homework_commons/index.json.jbuilder
+++ b/app/views/homework_commons/index.json.jbuilder
@@ -26,19 +26,17 @@ json.homeworks @homework_commons.each do |homework|
     json.uncommit_count studentwork_count homework, 0, @member
   end
 
-  if @user_course_identity < Course::STUDENT
-    if homework.homework_type == "practice"
-      json.shixun_identifier homework.shixuns.take.try(:identifier)
-      json.shixun_status homework.shixuns.take.try(:status).to_i
-    end
-  elsif @user_course_identity == Course::STUDENT
+  if homework.homework_type == "practice"
+    json.shixun_identifier homework.shixuns.take.try(:identifier)
+    json.shixun_status homework.shixuns.take.try(:status).to_i
+  end
+  if @user_course_identity == Course::STUDENT
     if homework.homework_type == "practice"
       shixun = homework.shixuns.take
       # json.challenge_count homework.shixuns.first.try(:challenges_count).to_i
       current_myshixun = homework.user_work(@user.id).try(:myshixun)
       myshixun = current_myshixun ? current_myshixun : shixun.myshixuns.find_by(user_id: @user.id)
       # json.game_count current_myshixun ? current_myshixun.exec_count : 0
-      json.shixun_status shixun.try(:status).to_i
       json.task_operation task_operation_url(myshixun, shixun)
     else
       work = homework.user_work(@user.id)