云上实验室

app/models/laboratory.rb

@@ -53,7 +53,7 @@ class Laboratory < ApplicationRecord
       laboratory_shixun_ids = laboratory_shixuns.pluck(:shixun_id)
       school_shixun_ids = Shixun.joins("join user_extensions on shixuns.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
       shixun_ids = laboratory_shixun_ids + school_shixun_ids
-      Shixun.where(id: shixun_ids.uniq)
+      Shixun.joins(:laboratory_shixuns).where(id: shixun_ids.uniq)
     else
       Shixun.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: id })
     end
@@ -66,7 +66,7 @@ class Laboratory < ApplicationRecord
       laboratory_subject_ids = laboratory_subjects.pluck(:subject_id)
       school_subject_ids = Subject.joins("join user_extensions on subjects.user_id=user_extensions.user_id").where(user_extensions: { school_id: school_id }).pluck(:id)
       subject_ids = laboratory_subject_ids + school_subject_ids
-      Subject.where(id: subject_ids.uniq)
+      Subject.joins(:laboratory_subjects).where(id: subject_ids.uniq)
     else
       Subject.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: id })
     end