Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/shixun_lists_controller.rb

@@ -1,7 +1,6 @@
 class ShixunListsController < ApplicationController
   def index
     @results = ShixunSearchService.call(search_params, current_laboratory)
-    Rails.logger.info("########results: #{@results.includes(:subjects)}")
   end
 
   private

app/views/shixun_lists/index.json.jbuilder

@@ -21,10 +21,10 @@ json.shixun_list do
     json.pic url_to_avatar(obj)
     json.content highlights
     json.level level_to_s(obj.trainee)
-    if params[:sort] != "wechat_myshixuns_count"
+    #if params[:sort] != "wechat_myshixuns_count"
-      json.subjects obj.subjects.visible.unhidden.uniq do |subject|
+      json.subjects obj.subjects.select{ |s| s.status == 2 && s.hidden == 0} do |subject|
         json.(subject, :id, :name)
       end
-    end
+    #end
   end
 end