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

app/controllers/exercises_controller.rb

@@ -1298,28 +1298,23 @@ class ExercisesController < ApplicationController
         end
 
         if params[:format] == "xlsx"
-          logger.info("#######___________params_xlsx____________##########")
-          logger.info("#######___________@exercise_users_size____________##########{@exercise_users_size}")
-          logger.info("#######___________@export_ex_users&.exercise_user_committed.size____________##########{@export_ex_users&.exercise_user_committed.size}")
-
-
           if @user_course_identity > Course::ASSISTANT_PROFESSOR
             tip_exception(403,"无权限操作")
           elsif (@exercise_users_size == 0) || ( @export_ex_users&.exercise_user_committed.size == 0)
-            logger.info("#######___________@exercise_users_size == 0____________##########")
-
             normal_status(-1,"暂无用户提交")
-          else
-            respond_to do |format|
-              format.xlsx{
-                get_export_users(@exercise,@course,@export_ex_users)
-                exercise_export_name =
-                    "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-                render xlsx: "#{exercise_export_name.strip.first(30)}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
-              }
-            end
+
           end
         end
+
+        respond_to do |format|
+          format.json
+          format.xlsx{
+            get_export_users(@exercise,@course,@export_ex_users)
+            exercise_export_name =
+                "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+            render xlsx: "#{exercise_export_name.strip.first(30)}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
+          }
+        end
       rescue Exception => e
         uid_logger_error(e.message)
         tip_exception("页面调用失败！")