移动编辑

ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseQuestionDealServiceImpl.java

@@ -282,7 +282,7 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                 if (request.getType() == 1){
                     //大题上移, 先查找上一题的题目id列表
                     KmtExerciseQuestion previousQuestion = kmtExerciseMapper.findByBookIdAndNum(kmtExerciseQuestion.getBookId(), kmtExerciseQuestion.getNum() - 1);
-                    if (!previousQuestion.getBookCourseId().equals(kmtExerciseQuestion.getBookCourseId())){
+                    if (previousQuestion ==null ||  !previousQuestion.getBookCourseId().equals(kmtExerciseQuestion.getBookCourseId())){
                         return responseEntity.failure(ResponseConstant.CODE_000, "已移动到第一题位置");
                     }
 
@@ -300,7 +300,7 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                     List<KmtExerciseQuestion> thisQuestions = kmtExerciseMapper.findQuestionsByBookCourseIdAndBigIndex(kmtExerciseQuestion.getBookCourseId(), kmtExerciseQuestion.getBigQuestionIndex());
                     int thisSize = thisQuestions.size();
                     KmtExerciseQuestion nextQuestion = kmtExerciseMapper.findByBookIdAndNum(kmtExerciseQuestion.getBookId(), kmtExerciseQuestion.getNum() + thisSize);
-                    if (!nextQuestion.getBookCourseId().equals(kmtExerciseQuestion.getBookCourseId())){
+                    if (nextQuestion == null || !nextQuestion.getBookCourseId().equals(kmtExerciseQuestion.getBookCourseId())){
                         return responseEntity.failure(ResponseConstant.CODE_000, "已移动到最后一题位置");
                     }
                     List<KmtExerciseQuestion> nextQuestions = kmtExerciseMapper.findQuestionsByBookCourseIdAndBigIndex(nextQuestion.getBookCourseId(), nextQuestion.getBigQuestionIndex());