From ad296e43b2bea989ba26a6b42ee4174cffa5b51d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 2 Jun 2015 16:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=90=AF=E7=94=A8=E5=8C=BF=E8=AF=84?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=EF=BC=8C=E5=AD=A6=E7=94=9F=E5=9C=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81=E4=B9=8B=E5=89=8D=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=9C=8B=E5=88=B0=E5=85=B6=E4=BB=96=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 7543bc770..0568ed077 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -13,7 +13,16 @@ class StudentWorkController < ApplicationController
     #老师 || 非匿评作业 || 匿评结束 显示所有的作品
     @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3
     if @show_all
-      @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+      if @homework.homework_type == 1 || @is_teacher || User.current.admin?
+        @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+      else
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if my_work.empty?
+          @stundet_works = []
+        else
+          @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+        end
+      end
     else #学生
       if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
         @stundet_works = @homework.student_works.where(:user_id => User.current.id)