From 6f0df10fdd0e55e5ed3e31b1720efd25e2bf02fb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 16 九月 2026 18:51:12 +0800
Subject: [PATCH] fix: 添加条件过滤以确保查询结果中合格数量大于零
---
src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
index aa0c858..a6c4149 100644
--- a/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
@@ -174,7 +174,7 @@
if (accountSubjectDto != null && accountSubjectDto.getStatus() != null) {
queryWrapper.eq(AccountSubject::getStatus, accountSubjectDto.getStatus());
}
- queryWrapper.orderByDesc(AccountSubject::getSubjectCode).orderByDesc(AccountSubject::getId);
+ queryWrapper.orderByAsc(AccountSubject::getSubjectCode).orderByAsc(AccountSubject::getId);
return queryWrapper;
}
@@ -296,8 +296,8 @@
}
List<AccountSubject> sortedSubjects = new ArrayList<>(subjects);
sortedSubjects.sort(Comparator
- .comparing(AccountSubject::getSubjectCode, Comparator.nullsFirst(String::compareTo)).reversed()
- .thenComparing(AccountSubject::getId, Comparator.nullsFirst(Long::compareTo)).reversed());
+ .comparing(AccountSubject::getSubjectCode, Comparator.nullsLast(String::compareTo))
+ .thenComparing(AccountSubject::getId, Comparator.nullsLast(Long::compareTo)));
Map<Long, AccountSubjectVo> subjectVoMap = new LinkedHashMap<>();
for (AccountSubject subject : sortedSubjects) {
--
Gitblit v1.9.3