Merge branches 'dev_aliyun' and 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

app/controllers/admins/shixun_settings_controller.rb

@@ -115,10 +115,13 @@ class Admins::ShixunSettingsController < Admins::BaseController
       sheet1[count_row, 5] = shixun.user.show_real_name
       sheet1[count_row, 6] = shixun.user.school_name
       sheet1[count_row, 7] = shixun.user.identity
-      shixun.challenges.each do |challenge|
+      challenge_count = shixun.challenges.count
+      shixun.challenges.each_with_index do |challenge, index|
         sheet1[count_row, 8] = "第#{challenge.position}关"
         sheet1[count_row, 9] = challenge.subject
-        count_row += 1
+        if index + 1 != challenge_count
+          count_row += 1
+        end
       end
       count_row += 1
     end

app/controllers/shixuns_controller.rb

@@ -909,16 +909,20 @@ class ShixunsController < ApplicationController
     # 搜索成员
     if request.get?
       @collaborators = @shixun.shixun_members.where("user_id != #{@shixun.user_id}")
-    else
-      if params[:user_id]
-        man_member = ShixunMember.where(:shixun_id => @shixun.id, :user_id => @shixun.user_id).first
-        cha_member = ShixunMember.where(:user_id => params[:user_id], :shixun_id => @shixun.id).first
-        if man_member && cha_member
-          man_member.update_attribute(:role, 2)
-          cha_member.update_attribute(:role, 1)
-          @shixun.update_attribute(:user_id, cha_member.user_id)
-        end
-      end
+		else
+			begin
+				raise("请先选择成员") if params[:user_id].blank?
+				man_member = ShixunMember.where(:shixun_id => @shixun.id, :user_id => @shixun.user_id).first
+				cha_member = ShixunMember.where(:user_id => params[:user_id], :shixun_id => @shixun.id).first
+				if man_member && cha_member
+					man_member.update_attribute(:role, 2)
+					cha_member.update_attribute(:role, 1)
+					@shixun.update_attribute(:user_id, cha_member.user_id)
+				end
+			rescue => e
+				logger.error("######change_manager_error: #{e.message}")
+				render_error(e.message)
+			end
     end
   end