From 620cc83d4b074d21a558e991143c4159df170069 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 6 May 2016 17:56:56 +0800 Subject: [PATCH] =?UTF-8?q?"=E4=BB=8E=E9=A2=98=E5=BA=93=E9=80=89=E7=94=A8?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A"=E6=9A=82=E6=97=B6=E5=8F=AA=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E5=85=AC=E5=85=B1=E4=BD=9C=E4=B8=9A=E5=92=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2575d598f..0dd947be4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -616,7 +616,11 @@ class UsersController < ApplicationController @r_sort = @b_sort == "desc" ? "asc" : "desc" @user = User.current if(params[:type].blank? || params[:type] == "1") #题库 - visible_course = Course.where("is_delete = 0") + if params[:is_import].to_i == 1 + visible_course = Course.where("is_public = 1 && is_delete = 0") + elsif params[:is_import].to_i == 0 + visible_course = Course.where("is_delete = 0") + end visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")" @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}") elsif params[:type] == "2" #我的题库 @@ -679,7 +683,11 @@ class UsersController < ApplicationController search = params[:name].to_s.strip.downcase type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")" if(params[:type].blank? || params[:type] == "1") #全部 - visible_course = Course.where("is_delete = 0") + if params[:is_import].to_i == 1 + visible_course = Course.where("is_public = 1 && is_delete = 0") + elsif params[:is_import].to_i == 0 + visible_course = Course.where("is_delete = 0") + end visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")" all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'") all_user_ids = all_homeworks.map{|hw| hw.user_id}