From 85517dcd5727e48b61bd8a67ebc1ebbb99b67363 Mon Sep 17 00:00:00 2001 From: yang <1175@qq.com> Date: Wed, 9 Oct 2024 14:57:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E9=80=89=E9=A2=98=EF=BC=8Cbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseContentServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java index dddfbe16..c982b756 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java @@ -221,20 +221,19 @@ public class CourseContentServiceImpl implements ICourseContentService { try { // 判断试卷类型 - if (courseExam.getPaperType() == 1 && StringUtils.isNotBlank(courseExam.getPaperContent()) && randomMode && qnum != null && qnum > 0) { - + if (courseExam.getPaperType() == 1 && StringUtils.isNotBlank(courseExam.getPaperContent())) { paperJson = courseExam.getPaperContent(); JsonNode rootNode = objectMapper.readTree(paperJson); JsonNode itemsNode = rootNode.path("items"); List itemsNodes = new ArrayList<>(); itemsNode.forEach(itemsNodes::add); - if (randomMode && qnum != null && qnum > 0 && itemsNodes.size() > qnum) { + if (randomMode && qnum != null && qnum > 0 && randomMode && qnum != null && qnum > 0 && itemsNodes.size() > qnum) { Collections.shuffle(itemsNodes); itemsNodes = itemsNodes.subList(0, qnum); } return itemsNodes; - } else if (courseExam.getPaperType() == 2 && randomMode && qnum != null && qnum > 0) { + } else if (courseExam.getPaperType() == 2) { IXaskCache cache = XaskCacheProvider.getCache(); String cacheKey = "course:exam:" + courseExamId + ":" + paperId; String cacheData = cache.getCacheObject(cacheKey); @@ -250,7 +249,7 @@ public class CourseContentServiceImpl implements ICourseContentService { List eqVoList = objectMapper.readValue(paperJson, new TypeReference>() { }); - if (eqVoList.size() > qnum) { + if (randomMode && qnum != null && qnum > 0 && eqVoList.size() > qnum) { Collections.shuffle(eqVoList); eqVoList = eqVoList.subList(0, qnum); }