diff --git a/app/services/shixun_search_service.rb b/app/services/shixun_search_service.rb
index 710910100..32488a7c3 100644
--- a/app/services/shixun_search_service.rb
+++ b/app/services/shixun_search_service.rb
@@ -23,10 +23,9 @@ class ShixunSearchService < ApplicationService
       if User.current.admin? || User.current.business? || !User.current.school_id
         @shixuns = @shixuns.where(hidden: 0)
       else
-        shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
-        shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
+        none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id)
 
-        @shixuns = @shixuns.where("use_scope = 1 or id in (#{shixun_ids})").unhidden.published.or(@shixuns.where(id: User.current.shixuns))
+        @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0, status: 2, public: 2).or(@shixuns.where(id: User.current.shixuns))
       end
     end