From 737fff1f1151b2d354b080722242eb1030d7117d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 19 Feb 2020 16:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=BB=84=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb                      | 2 +-
 app/controllers/examination_intelligent_settings_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d81b3abb3..411481f0e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -308,7 +308,7 @@ class ApplicationController < ActionController::Base
 		end
 
 		if !User.current.logged? && Rails.env.development?
-			User.current = User.find 8686
+			User.current = User.find 1
 		end
 
 
diff --git a/app/controllers/examination_intelligent_settings_controller.rb b/app/controllers/examination_intelligent_settings_controller.rb
index f4dcc1535..10384b7cb 100644
--- a/app/controllers/examination_intelligent_settings_controller.rb
+++ b/app/controllers/examination_intelligent_settings_controller.rb
@@ -36,7 +36,7 @@ class ExaminationIntelligentSettingsController < ApplicationController
   end
 
   def exchange_one_item
-    item = @exam.item_baskets.find_by!(id: params[:item_id])
+    item = @exam.item_baskets.find_by!(item_bank_id: params[:item_id])
     exam_type_setting = @exam.examination_type_settings.find_by!(item_type: item.item_type)
 
     # 获取可选的题