diff --git a/app/controllers/exercise_questions_controller.rb b/app/controllers/exercise_questions_controller.rb
index 490791918..8c4eb0a89 100644
--- a/app/controllers/exercise_questions_controller.rb
+++ b/app/controllers/exercise_questions_controller.rb
@@ -424,14 +424,18 @@ class ExerciseQuestionsController < ApplicationController
       begin
         choice_d_id = params[:choice_no].to_i  # 选项的当前位置
         question_choices = @exercise_question.exercise_choices
-        delete_answer = question_choices.find_choice_custom("choice_position",choice_d_id).first
-        left_choice = question_choices.left_choice_choose("choice_position",choice_d_id)
-        if left_choice.present?
-          left_choice.each do |p|
-            p.choice_position -= 1
-            p.save
-          end
-        end
+        delete_answer = question_choices.find_by(choice_position: choice_d_id)
+        left_choices = question_choices.where("choice_position > ? ",choice_d_id)
+        left_choices.update_all("choice_position = choice_position - 1") if left_choices
+        # delete_answer = question_choices.find_choice_custom("choice_position",choice_d_id).first
+        #
+        # left_choice = question_choices.left_choice_choose("choice_position",choice_d_id)
+        # if left_choice.present?
+        #   left_choice.each do |p|
+        #     p.choice_position -= 1
+        #     p.save
+        #   end
+        # end
         if delete_answer.destroy
           normal_status(0, "答案删除成功！")
         else
@@ -450,13 +454,15 @@ class ExerciseQuestionsController < ApplicationController
       begin
         question_d_id = @exercise_question.question_number.to_i  #问题的当前位置
         exercise_questions = @exercise.exercise_questions
-        left_question = exercise_questions.left_question_choose("question_number",question_d_id)
-        if left_question.present?
-          left_question.each do |q|
-            q.question_number -= 1
-            q.save
-          end
-        end
+        left_questions = exercise_questions.where("question_number > ?", question_d_id)
+        left_questions.update_all("question_number = question_number - 1") if left_questions
+        # left_question = exercise_questions.left_question_choose("question_number",question_d_id)
+        # if left_question.present?
+        #   left_question.each do |q|
+        #     q.question_number -= 1
+        #     q.save
+        #   end
+        # end
         if @exercise_question.destroy
           normal_status(0, "问题删除成功！")
         else
diff --git a/app/controllers/poll_questions_controller.rb b/app/controllers/poll_questions_controller.rb
index 47cd236a9..c7407c129 100644
--- a/app/controllers/poll_questions_controller.rb
+++ b/app/controllers/poll_questions_controller.rb
@@ -156,14 +156,18 @@ class PollQuestionsController < ApplicationController
       begin
         answer_d_id = params[:answer_no].to_i  # 答案的当前位置
         poll_answers = @poll_question.poll_answers
-        delete_answer = poll_answers.find_answer_by_custom("answer_position",answer_d_id).first
-        left_answer = poll_answers.left_answer_choose("answer_position",answer_d_id)
-        if left_answer.present?
-          left_answer.each do |p|
-            p.answer_position -= 1
-            p.save
-          end
-        end
+        delete_answer = poll_answers.find_by(answer_position: answer_d_id)
+        left_answers =  poll_answers.where("answer_position > ?",answer_d_id)
+        left_answers.update_all("answer_position = answer_position - 1") if left_answers
+
+        # delete_answer = poll_answers.find_answer_by_custom("answer_position",answer_d_id).first
+        # left_answer = poll_answers.left_answer_choose("answer_position",answer_d_id)
+        # if left_answer.present?
+        #   left_answer.each do |p|
+        #     p.answer_position -= 1
+        #     p.save
+        #   end
+        # end
         if delete_answer.destroy
           normal_status(0, "答案删除成功！")
         else