Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server

app/controllers/competition_infos_controller.rb

@@ -635,12 +635,12 @@ class CompetitionInfosController < ApplicationController
       if params[:keyword].present?
         competition_users = competition_users.where("competition_users.org_name LIKE :keyword OR competition_users.leader LIKE :keyword OR competition_users.ext4 LIKE :keyword ", keyword: "%#{params[:keyword].to_s}%")
       end
-      @competition_users_count = competition_users.count
       competition_users = competition_users.select("distinct competition_users.*").joins(:competition_user_scores)
                                            .where("competition_users.status = 3")
                                            .where("competition_user_scores.stage = ? ", @stage.to_i)
                                            .where("competition_user_scores.score > 0")
                                            .order("competition_user_scores.score desc, competition_user_scores.created_at asc")
+      @competition_users_count = competition_users.count
       @rank_num = competition_users.pluck("distinct competition_users.id")
       @competition_users = paginate(competition_users)
     else