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

app/controllers/discusses_controller.rb

@@ -11,9 +11,9 @@ class DiscussesController < ApplicationController
 
     # 总数，分页使用
     if @manger
-      @disscuss_count = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s, :root_id => nil).count
       disscusses = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s,
                                              :root_id => nil)
+      @disscuss_count = disscusses.count
       @discusses = disscusses.joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
                        .select("discusses.*, games.identifier").includes(:user, :praise_treads).limit(LIMIT).offset(offset)
     else

app/controllers/games_controller.rb

@@ -26,7 +26,7 @@ class GamesController < ApplicationController
     game_count = Game.where(myshixun_id: @game.myshixun_id).count
 
     discusses = @shixun.discusses
-    discusses = discusses.where('hidden = false OR user_id = :user_id', user_id: current_user.id) unless current_user.admin?
+    discusses = discusses.where('hidden = false OR user_id = :user_id', user_id: current_user.id) unless current_user.admin_or_business?
     discusses_count = discusses.count
 
     @user = @game.owner

lib/tasks/statistic_subject_info.rake

@@ -134,7 +134,6 @@ namespace :subjects do
         buffer_size += 1
         if buffer_size == 1000
           sql = "REPLACE INTO subject_user_infos(#{column_value}) VALUES #{str}"
-          puts sql
           ActiveRecord::Base.connection.execute sql
           str = ""
           buffer_size = 0