申请引用过的作业在课程删除后不应该在申请题库中显示

app/controllers/users_controller.rb

@@ -634,18 +634,27 @@ class UsersController < ApplicationController
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "3" #申请题库
-      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
+      #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc')
       #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
-      #@homeworks = HomeworkCommon.where("id in #{homework_ids}")
-      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} order by ah.created_at desc"
+      #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}")
+
+      sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc"
       @homeworks = HomeworkCommon.find_by_sql(sql)
     end
-    if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
-    elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+    if params[:property]
+      all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")"
+      if params[:property] == "1"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1")
+        #@homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "2"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2")
+        #@homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
+      elsif params[:property] == "3"
+        @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3")
+        #@homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
+      end
     end
     @type = params[:type]
     @property = params[:property]
@@ -723,13 +732,15 @@ class UsersController < ApplicationController
     elsif params[:type] == "3" #申请题库
       apply_homeworks = ApplyHomework.where("user_id = ?",@user.id)
       homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")"
+      none_visible_course = Course.where("is_delete = 1")
+      none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")"
       if @order == "course_name"
-        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+        sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where courses.is_delete = 0 and homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
         @homeworks = HomeworkCommon.find_by_sql(sql)
       elsif @order == "user_name"
-        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+        @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and course_id not in #{none_visible_course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
       else
-        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+        @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and course_id not in #{none_visible_course_ids} and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
       end
     end
 =begin