From 7c975c9092f3bc3bddeebc4e0f318f6419ea75a0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 11 Oct 2019 17:45:40 +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, 2 insertions(+), 8 deletions(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index d209e0b38..83b80bec4 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -164,14 +164,8 @@ class HomeworkCommonsController < ApplicationController
           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(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(myshixuns: {status: 1}))
-          end
+          @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.where(myshixuns: {status: 0})) if work_status.include?(3)
+          @student_works = @student_works.or(all_student_works.where(myshixuns: {status: 1})) if work_status.include?(4)
         end
 
         # 分班情况