Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/homework_commons_controller.rb

@@ -107,8 +107,6 @@ class HomeworkCommonsController < ApplicationController
     student_works = @homework.all_works
     @all_member_count = student_works.size
 
-    logger.info("###########______@homework.publish_time_________#{@homework.publish_time}")
-
     if @homework.publish_time.blank? || (@homework.publish_time > Time.now)
       @student_works = []
       if (params[:format] == "xlsx") || (params[:format] == "zip")

app/controllers/myshixuns_controller.rb

@@ -266,10 +266,11 @@ class MyshixunsController < ApplicationController
         if content != last_content
           @content_modified = 1
 
-          author_name = current_user.full_name
+          author_name = current_user.real_name
           author_email = current_user.mail
           message = params[:evaluate] == 0 ? "System automatically submitted" : "User submitted"
-          uid_logger("")
+          uid_logger("112233#{author_name}")
+          uid_logger("112233#{author_email}")
           @content = GitService.update_file(repo_path: @repo_path,
                                             file_path: path,
                                             message: message,

app/views/polls/commit_result.xlsx.axlsx

@@ -49,7 +49,7 @@ wb.styles do |s|
     end  #each_with_index
 
     sheet.add_row poll_users_info, :height =>15, :style => blue_cell
-    poll_users.each_with_index do |u,index|
+    poll_users.includes(user: :user_extension).each_with_index do |u,index|
       u_user = u.user
       user_answer_array = []
       poll_questions.each do |q|