xiongyuxing/ruoyi-vue-pro
1
0
Fork 0
forked from wangziqi/ruoyi-vue-pro
Code Pull Requests Activity

fix(education): preserve manual collection order

Browse Source
This commit is contained in:
wangziqi
2026-07-31 10:27:49 +08:00
parent eae5a6bb3a
commit c3c244a6f5
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/practice/PracticeSessionServiceImpl.java
View File

@@ -465,7 +465,7 @@ public class PracticeSessionServiceImpl implements PracticeSessionService {
// ========== internal helpers ==========
/**
* 从 provider 获取题目列表，按 questionId 稳定排序，取前 count 条。
* 从 provider 获取题目列表。题集路由保留手工成员顺序；其他路由按 questionId 稳定排序。
* 所有筛选条件（含 nodeId）完整转发到 provider，不做客户端裁剪。
*/
private List<CatalogQuestionDTO> fetchAndOrderQuestions(String collectionId, String nodeId,
@@ -501,8 +501,10 @@ public class PracticeSessionServiceImpl implements PracticeSessionService {
throw exception(INSUFFICIENT_ELIGIBLE_QUESTIONS, 0, count);
}
allQuestions.sort(Comparator.comparing(CatalogQuestionDTO::getId, Comparator.nullsLast(String::compareTo))
.thenComparing(CatalogQuestionDTO::getContentVersion, Comparator.nullsLast(String::compareTo)));
if (collectionId == null || collectionId.isBlank()) {
allQuestions.sort(Comparator.comparing(CatalogQuestionDTO::getId, Comparator.nullsLast(String::compareTo))
.thenComparing(CatalogQuestionDTO::getContentVersion, Comparator.nullsLast(String::compareTo)));
}
if (allQuestions.size() > count) {
allQuestions = allQuestions.subList(0, count);
}