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

app/controllers/application_controller.rb

@@ -416,7 +416,7 @@ class ApplicationController < ActionController::Base
 	# 实训主类别列表，自带描述
 	def shixun_main_type
 		list = []
-		mirrors = MirrorRepository.select([:id, :type_name]).published_main_mirror
+		mirrors = MirrorRepository.select([:id, :type_name, :description]).published_main_mirror
 		mirrors.try(:each) do |mirror|
 			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description)}
 		end

app/controllers/graduation_works_controller.rb

@@ -274,7 +274,7 @@ class GraduationWorksController < ApplicationController
     @is_author = @work.user_id == current_user.id
     @work_members = @task.task_type == 1 ? [] : @task.graduation_works.where.not(user_id: @work.user_id).
         where(group_id: @work.group_id).includes(:user)
-    @attachments = @work.attachments.where.not(attachtype: 7)
+    @attachments = @work.attachments.where("attachtype != 7 or attachtype is null")
   end
 
   def comment_list

app/controllers/subjects_controller.rb

@@ -450,7 +450,7 @@ class SubjectsController < ApplicationController
       @time = 0
       @user_tags = []
     else
-      pass_challenge_ids = pass_games.map(&:challenge_id)
+      pass_challenge_ids = pass_games.map(&:challenge_id).uniq # 按道理是不用去重的，但是历史数据与重复
       subject_challenge_count = @subject.shixuns.sum(:challenges_count)
       # 用户通关获得的标签
       @user_tags = ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name)