|
|
|
@ -572,8 +572,8 @@ class UsersController < ApplicationController
|
|
|
|
|
@r_sort = @b_sort == "desc" ? "asc" : "desc"
|
|
|
|
|
@user = User.current
|
|
|
|
|
search = params[:name].to_s.strip.downcase
|
|
|
|
|
type_ids = params[:property] ? "(" + params[:property] + ")" : "(1, 2, 3)"
|
|
|
|
|
if(params[:type].blank? || params[:type] == "1") #全部
|
|
|
|
|
type_ids = params[:property]=="" ? "(1, 2, 3)" : "(" + params[:property] + ")"
|
|
|
|
|
if(params[:type].blank? || params[:type] == "1") #全部
|
|
|
|
|
visible_course = Course.where("is_public = 1 && is_delete = 0")
|
|
|
|
|
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}'")
|
|
|
|
|