Merge branch 'dev_aliyun' into develop

app/controllers/colleges_controller.rb

@@ -53,7 +53,7 @@ class CollegesController < ApplicationController
         homeworks = HomeworkCommon.where(:homework_type => 4, :course_id => course_ids.map(&:id))
         un_shixun_work_count = homeworks.where("publish_time > '#{Time.now}' or publish_time is null").count
         shixun_work_count = homeworks.size - un_shixun_work_count
-        student_count = StudentsForCourse.where(:course_id => course_ids.map(&:id)).count
+        student_count = CourseMember.where(course_id: course_ids.map(&:id), role: 4).count
         myshixun_ids = StudentWork.select("myshixun_id").where("homework_common_id in (#{homeworks.map(&:id).join(',').strip == "" ? -1 : homeworks.map(&:id).join(',')}) and myshixun_id is not null")
         complete_myshixun = Myshixun.select("id").where(:status => 1, :id => myshixun_ids.map(&:myshixun_id)).size
         all_myshixun = Myshixun.select("id").where(:id => myshixun_ids.map(&:myshixun_id)).size
@@ -105,7 +105,7 @@ class CollegesController < ApplicationController
     @courses = paginate courses
 
     course_ids = @courses.map(&:id)
-    @student_count     = StudentsForCourse.where(course_id: course_ids).group(:course_id).count
+    @student_count     = CourseMember.where(course_id: course_ids, role: 4).group(:course_id).count
     @shixun_work_count = HomeworkCommon.where(homework_type: 4, course_id: course_ids).group(:course_id).count
     @attachment_count  = Attachment.where(container_id: course_ids, container_type: 'Course').group(:container_id).count
     @message_count     = Message.joins(:board).where(boards: { parent_id: 0, course_id: course_ids }).group('boards.course_id').count

app/services/shixun_search_service.rb

@@ -23,9 +23,10 @@ class ShixunSearchService < ApplicationService
       if User.current.admin? || User.current.business? || !User.current.school_id
         @shixuns = @shixuns.where(hidden: 0)
       else
-        none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id)
+        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(",")
 
-        @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0, status: 2, public: 2).or(@shixuns.where(id: User.current.shixuns))
+        @shixuns = @shixuns.where("use_scope = 1 or id in (#{shixun_ids})").unhidden.published.or(@shixuns.where(id: User.current.shixuns))
       end
     end