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

dev_new_shixunsrepository
杨树明 5 years ago
commit acf67ad0f9

@ -103,7 +103,7 @@ class Poll < ApplicationRecord
if course.is_end if course.is_end
status = 4 status = 4
else else
if user.present? && user.student_of_course?(course) if user.present? && user.course_identity(course) == Course::STUDENT
ex_time = get_poll_times(user.id,false) ex_time = get_poll_times(user.id,false)
pb_time = ex_time[:publish_time] pb_time = ex_time[:publish_time]
ed_time = ex_time[:end_time] ed_time = ex_time[:end_time]

Loading…
Cancel
Save