diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java index ecba4d2..250b1c1 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java @@ -133,7 +133,10 @@ public class LaborEducationServiceImpl implements LaborEducationService { } //examIds.add("c26e5766-597f-45b3-91ad-19e76426323b"); //获取所有课程下的课中活动 - List exams = examRepository.findExamsByIds(String.format(PK.EXAM, laborDto.getTmdId()), recordIds); + List exams = new ArrayList<>(); + if (!recordIds.isEmpty()) { + exams = examRepository.findExamsByIds(String.format(PK.EXAM, laborDto.getTmdId()), recordIds); + } Map>> knowledgeMap = new HashMap<>(); Map> point = new HashMap<>(); for (Exam exam : exams) { @@ -149,8 +152,10 @@ public class LaborEducationServiceImpl implements LaborEducationService { for (Exam exam : exams) { examIds.add(exam.getId()); } - List examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds); - + List examResults = new ArrayList<>(); + if (!examIds.isEmpty()) { + examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds); + } Map resMap = new HashMap<>(); //处理德育知识块和知识点的关联关系 resMap.put("subjectiveCount", res.size()); //主观评价数