From 891dae66a7643879c44a9d5362787b081c19878a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 11 Oct 2019 17:42:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 735798d38..d209e0b38 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -161,16 +161,16 @@ class HomeworkCommonsController < ApplicationController
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
           work_status = params[:work_status].map{|status| status.to_i}
-          all_student_works = @student_works
+          all_student_works = @student_works.left_joins(:myshixun)
           @student_works = all_student_works.where(work_status: work_status)
 
           if work_status.include?(3)
-            ids = all_student_works.joins(:myshixun).where(myshixuns: {status: 0}).pluck(:id)
-            @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.where(id: ids))
+            # ids = all_student_works.joins(:myshixun).where(myshixuns: {status: 0}).pluck(:id)
+            @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.where(myshixuns: {status: 0}))
           end
           if work_status.include?(4)
-            ids = all_student_works.joins(:myshixun).where(myshixuns: {status: 1}).pluck(:id)
-            @student_works = @student_works.or(all_student_works.where(id: ids))
+            # ids = all_student_works.joins(:myshixun).where(myshixuns: {status: 1}).pluck(:id)
+            @student_works = @student_works.or(all_student_works.where(myshixuns: {status: 1}))
           end
         end