Merge remote-tracking branch 'origin/master'

龚焕茏

2024-07-16 ca52d40005e5a1fb7dd2f9d95d8caea6c538d14a

 src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java

@@ -271,6 +271,7 @@
            if(userDepartments.size() != 0){
                Department byId = departmentService.getById(userDepartments.get(0).getDepartmentId());
                e.setDepartmentName(byId.getName());
                e.setDeptId(byId.getId());
            }
            return e;
        }).collect(Collectors.toList());
@@ -529,9 +530,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<>();
            //多选