|
|
@ -1004,9 +1004,8 @@ class PollsController < ApplicationController
|
|
|
|
search_content = params[:search]
|
|
|
|
search_content = params[:search]
|
|
|
|
|
|
|
|
|
|
|
|
if @poll_users_list.present? && @poll_users_list.count > 0
|
|
|
|
if @poll_users_list.present? && @poll_users_list.count > 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#答题状态的选择
|
|
|
|
#答题状态的选择
|
|
|
|
|
|
|
|
#
|
|
|
|
if choose_type.present?
|
|
|
|
if choose_type.present?
|
|
|
|
@poll_users_list = @poll_users_list.commit_by_status(choose_type)
|
|
|
|
@poll_users_list = @poll_users_list.commit_by_status(choose_type)
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -1037,7 +1036,7 @@ class PollsController < ApplicationController
|
|
|
|
page = params[:page] || 1
|
|
|
|
page = params[:page] || 1
|
|
|
|
limit = params[:limit] || 20
|
|
|
|
limit = params[:limit] || 20
|
|
|
|
@poll_users_list = @poll_users_list.page(page).per(limit)
|
|
|
|
@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(:id, :user_id)}")
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@poll_users_list = []
|
|
|
|
@poll_users_list = []
|
|
|
|
@poll_users_size = 0
|
|
|
|
@poll_users_size = 0
|
|
|
|