diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index bf5466b1e..efc117d6a 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -242,8 +242,8 @@ class SubjectsController < ApplicationController
     ## 云上实验室过滤
     @courses = @courses.where(id: current_laboratory.all_courses)
 
-    @none_shixun_ids = @subject.shixuns.joins(:shixun_schools)
-                           .where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:id)
+    @all_shixun_ids = @subject.shixuns.where(use_scope: 0).pluck(:id) +
+      @subject.shixuns.joins(:shixun_schools).where("school_id = #{current_user.user_extension.try(:school_id).to_i} and use_scope = 1").pluck(:id)
   end
 
   def send_to_course
diff --git a/app/views/subjects/choose_course.json.jbuilder b/app/views/subjects/choose_course.json.jbuilder
index 2e03c5287..8dae4e3e4 100644
--- a/app/views/subjects/choose_course.json.jbuilder
+++ b/app/views/subjects/choose_course.json.jbuilder
@@ -7,7 +7,7 @@ end
 json.stages @subject.stages.includes(shixuns: [user: :user_extension]) do |stage|
   index = 1
   json.shixuns stage.shixuns do |shixun|
-    if shixun.status == 2 && !shixun.is_jupyter && !@none_shixun_ids.include?(shixun.id)
+    if shixun.status == 2 && !shixun.is_jupyter && @all_shixun_ids.include?(shixun.id)
       json.shixun_id shixun.id
       json.id shixun.id
       json.identifier shixun.identifier