From 9c47cdc8175e8efcdf64a1b56d9c825ae255fce5 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期三, 30 九月 2026 09:52:01 +0800
Subject: [PATCH] fix(study): 添加id二级排序固定study查询顺序
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 3845ca3..e3c7e21 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -764,7 +764,8 @@
// 听音选图
List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
.eq("week", week)
- .eq("day", day).orderByAsc("studySort"));
+ // studySort 会有重复值，追加 id 升序作为二级排序，保证与提交数组顺序一致
+ .eq("day", day).orderByAsc("studySort").orderByAsc("id"));
List<TSubject> list9 = subjectService.list();
for (TStudyListen tStudyListen : list) {
@@ -793,7 +794,7 @@
// 看音选图
List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
.eq("week", week)
- .eq("day", day).orderByAsc("studySort")
+ .eq("day", day).orderByAsc("studySort").orderByAsc("id")
);
for (TStudyLook tStudyLook : list1) {
int index = 0;
@@ -828,7 +829,7 @@
// 归纳排除
List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
.eq("week", week)
- .eq("day", day).orderByAsc("studySort")
+ .eq("day", day).orderByAsc("studySort").orderByAsc("id")
);
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
@@ -856,7 +857,7 @@
// 有问有答
List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
.eq("week", week)
- .eq("day", day).orderByAsc("studySort"));
+ .eq("day", day).orderByAsc("studySort").orderByAsc("id"));
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
@@ -909,7 +910,7 @@
// 音图相配
List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
.eq("week", week)
- .eq("day", day).orderByAsc("studySort")
+ .eq("day", day).orderByAsc("studySort").orderByAsc("id")
);
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
--
Gitblit v1.7.1