From cbb064b9e872cf8e95b7c762c244bb2fd8c21bcf Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 25 Dec 2019 17:06:53 +0800
Subject: [PATCH 1/3] 1

---
 app/controllers/shixuns_controller.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 859dce6f6..36a9e03ac 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/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
 

From 3b8bd6d454904dc05d13258f121ce4022955c2c1 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 25 Dec 2019 17:07:23 +0800
Subject: [PATCH 2/3] 1

---
 app/controllers/shixuns_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 36a9e03ac..992bd87f8 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -911,7 +911,7 @@ class ShixunsController < ApplicationController
       @collaborators = @shixun.shixun_members.where("user_id != #{@shixun.user_id}")
 		else
 			begin
-				raise("必须选择一个用户才能更换管理员") if params[:user_id].blank?
+				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

From fed9f6e912cd4d96472d0038c04910d0b25b1d19 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 25 Dec 2019 17:11:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=A9=BA=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/shixun_settings_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admins/shixun_settings_controller.rb b/app/controllers/admins/shixun_settings_controller.rb
index 6dbbc077a..547e31fd9 100644
--- a/app/controllers/admins/shixun_settings_controller.rb
+++ b/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