diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 21a919efd..edb3fba00 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -135,6 +135,7 @@ class PollsController < ApplicationController
         :course_id => @course.id,
         :polls_status => 1,
         :polls_type => "Course",
+        :un_anonymous => true
       }
       @poll = Poll.create!(poll_options)
     end
diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb
index d584072c2..3f0eec248 100644
--- a/app/controllers/weapps/attendances_controller.rb
+++ b/app/controllers/weapps/attendances_controller.rb
@@ -27,7 +27,7 @@ class Weapps::AttendancesController < ApplicationController
     tip_exception(403) if @user_course_identity >= Course::STUDENT
     current_date = Date.current
     current_end_time = Time.current.strftime("%H:%M:%S")
-    @current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and end_time > '#{current_end_time}'")
+    @current_attendance = @course.course_attendances.where("attendance_date > '#{current_date}' or (attendance_date = '#{current_date}' and end_time > '#{current_end_time}')")
                             .order("attendance_date asc, start_time asc")
 
     all_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")