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

app/controllers/exercises_controller.rb

@@ -1177,15 +1177,16 @@ class ExercisesController < ApplicationController
         @exercise_status = @exercise.get_exercise_status(current_user.id)
         @course_all_members = @course.students
         @c_group_counts = @course.course_groups_count
-        question_types = @exercise.exercise_questions.pluck(:question_type)
+        question_types = @exercise.exercise_questions.pluck(:question_type).uniq
         @exercise_publish_count = get_user_permission_course(exercise_ids,2).count #判断是否有已发布的分班
         @exercise_unpublish_count = get_user_permission_course(exercise_ids,1).count  #判断是否有未发布的分班
 
-        if question_types.include?(4)   #是否包含主观题
+        if (question_types.size > 1) &&  question_types.include?(4)   #是否包含主观题,或者是否大于1
           @subjective_type = 1
         else
           @subjective_type = 0
         end
+
         if @user_course_identity < Course::STUDENT  #当前为老师，而且老师只能查看自己班级的/课堂的试卷
           @exercise_current_user_status = 0
           if @exercise_status == 1