From 23333a8186e50f1ab51d0fc17fd8de027f5cdd80 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 2 Jul 2019 14:55:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/polls_controller.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 6a8edee71..d928d1df5 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -1005,12 +1005,6 @@ class PollsController < ApplicationController
 
         if @poll_users_list.present? && @poll_users_list.count > 0
 
-          if order == "student_id"
-            @poll_users_list = @poll_users_list.joins(user: [:user_extension]).order("user_extensions.student_id DESC")
-          else
-            @poll_users_list = @poll_users_list.order("end_at DESC")
-          end
-
           #答题状态的选择
           if choose_type.present?
             @poll_users_list = @poll_users_list.commit_by_status(choose_type)
@@ -1027,8 +1021,12 @@ class PollsController < ApplicationController
           if search_content.present?
             @poll_users_list = @poll_users_list.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR student_id like ?", "%#{search_content}%", "%#{search_content}%")
           end
-
-          logger.info("#######F_______@poll_users_list_last___@users_ids________________####{@poll_users_list.pluck(:user_id)}")
+          if order == "student_id"
+            @poll_users_list = @poll_users_list.joins(user: :user_extension).order("user_extensions.student_id DESC")
+          else
+            @poll_users_list = @poll_users_list.order("end_at DESC")
+          end
+          logger.info("#######user_id: ####{@poll_users_list.pluck(:user_id).sort}")
 
           @poll_users_size = @poll_users_list.count
 
@@ -1036,7 +1034,7 @@ class PollsController < ApplicationController
           page  = params[:page] || 1
           limit = params[:limit] || 20
           @poll_users_list = @poll_users_list.page(page).per(limit)
-          logger.info("#######F_______@poll_users_list_after_page___@users_ids________________####{@poll_users_list.pluck(:user_id)}")
+          logger.info("#####page_user: #{@poll_users_list.pluck(:user_id).sort}")
         else
           @poll_users_list = []
           @poll_users_size = 0

From 91d875c36b9bbab0a02b12cbd900b297f2cb861d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 2 Jul 2019 15:01:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/polls_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index d928d1df5..50784ee74 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -1024,9 +1024,9 @@ class PollsController < ApplicationController
           if order == "student_id"
             @poll_users_list = @poll_users_list.joins(user: :user_extension).order("user_extensions.student_id DESC")
           else
-            @poll_users_list = @poll_users_list.order("end_at DESC")
+            @poll_users_list = @poll_users_list.joins(user: :user_extension).order("end_at DESC")
           end
-          logger.info("#######user_id: ####{@poll_users_list.pluck(:user_id).sort}")
+          logger.info("#######user_id: ####{@poll_users_list.pluck(:id, :user_id)}")
 
           @poll_users_size = @poll_users_list.count
 
@@ -1034,7 +1034,7 @@ class PollsController < ApplicationController
           page  = params[:page] || 1
           limit = params[:limit] || 20
           @poll_users_list = @poll_users_list.page(page).per(limit)
-          logger.info("#####page_user: #{@poll_users_list.pluck(:user_id).sort}")
+          logger.info("#####page_user: #{@poll_users_list.pluck(:id, :user_id)}")
         else
           @poll_users_list = []
           @poll_users_size = 0