Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/courses_controller.rb

@@ -1349,6 +1349,7 @@ class CoursesController < ApplicationController
 
   def search_slim
     courses = current_user.manage_courses.not_deleted.processing
+    courses = courses.where(id: current_laboratory.all_courses)
 
     keyword = params[:keyword].to_s.strip
     if keyword.present?

app/controllers/weapps/homes_controller.rb

@@ -16,6 +16,7 @@ class Weapps::HomesController < Weapps::BaseController
                 current_user.manage_courses
                end
     @courses = @courses.not_deleted.not_excellent
+    @courses = @courses.where(id: current_laboratory.all_courses)
     @course_count = @courses.count
     order_str = "course_members.sticky=1 desc, course_members.sticky_time desc, courses.created_at desc"
     @courses = paginate(@courses.order(order_str).includes(:teacher, :school))