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

app/controllers/application_controller.rb

@@ -185,7 +185,9 @@ class ApplicationController < ActionController::Base
 
 	# 系统全局认证
 	def check_auth
-		if current_user.certification != 1
+		if current_user.certification != 1 && current_user.apply_actions.exists?(container_type: 'TrialAuthorization', status: 0)
+			tip_exception(-1, "您的试用申请正在审核中，请耐心等待")
+		elsif current_user.certification != 1
 			day_cer = UserDayCertification.find_by(user_id: current_user.id)
 			tip_exception(407, "系统未授权") unless (Time.now.to_i - day_cer.try(:created_at).to_i) < 86400
 		elsif !current_user.profile_completed?

app/controllers/homework_commons_controller.rb

@@ -170,6 +170,7 @@ class HomeworkCommonsController < ApplicationController
         end
 
         @work_count = @student_works.size
+        @work_excel = @student_works.where("work_status > 0")
 
         # 排序
         rorder = params[:order].blank? ? "update_time" : params[:order]
@@ -180,8 +181,6 @@ class HomeworkCommonsController < ApplicationController
           @student_works = @student_works.joins(user: :user_extension).order("user_extensions.#{rorder} #{b_order}")
         end
 
-        @work_excel = @student_works
-
         # 分页参数
         page = params[:page] || 1
         limit = params[:limit] || 20
@@ -195,10 +194,9 @@ class HomeworkCommonsController < ApplicationController
       end
 
       if params[:format] == "xlsx"
-        complete_works = @work_excel.present? ? @work_excel.where("work_status > 0").size : 0
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
-        elsif complete_works == 0
+        elsif @work_excel.size == 0
           normal_status(-1,"暂无用户提交！")
         else
           respond_to do |format|