实践课程和实训首页的过滤

app/controllers/shixuns_controller.rb

@@ -38,6 +38,9 @@ class ShixunsController < ApplicationController
 		## 云上实验室过滤
 		unless current_laboratory.main_site?
 			@shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: current_laboratory.id })
+		else
+			not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{current_laboratory.id}")
+			@shixuns = @shixuns.where.not(id: not_shixun_ids)
 		end
 
 		## 方向

app/controllers/subjects_controller.rb

@@ -56,6 +56,9 @@ class SubjectsController < ApplicationController
       # 云上实验室过滤
       unless current_laboratory.main_site?
         @subjects = @subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id })
+      else
+        not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{current_laboratory.id}")
+        @subjects = @subjects.where.not(id: not_subject_ids)
       end
 
       # 类型