From c2cd507da74f1841d0133d4c9bff9025ce1066ba Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 09 七月 2024 10:00:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' --- src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java index 3417e8c..7049976 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java @@ -529,9 +529,10 @@ Integer order = 0; for (QuestionTypeVM questionTypeVM : questionTypeVMList) { - List<Integer> questions = questionSubjectService.getSubject(questionTypeVM.getSubjectId()) + List<Integer> questions = questionSubjectService.getSubjectBySubjectIds(examPaperEditRequestVM.getSubjectId()) .stream().map(QuestionSubject::getQuestionId).collect(Collectors.toList()); List<Question> list = questionService.selectByIds(questions); + // List<Question> list = questionService.getAll(); Map<Integer, Integer> multiple = new HashMap<>(); //澶氶�� -- Gitblit v1.8.0