From 8beb176e14312b8e7ca43a25f8ec1386157502f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 28 五月 2026 14:40:42 +0800
Subject: [PATCH] feat:采购批量审核-质检-入库

---
 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 a6c4149..aa0c858 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.orderByAsc(AccountSubject::getSubjectCode).orderByAsc(AccountSubject::getId);
+        queryWrapper.orderByDesc(AccountSubject::getSubjectCode).orderByDesc(AccountSubject::getId);
         return queryWrapper;
     }
 
@@ -296,8 +296,8 @@
         }
         List<AccountSubject> sortedSubjects = new ArrayList<>(subjects);
         sortedSubjects.sort(Comparator
-                .comparing(AccountSubject::getSubjectCode, Comparator.nullsLast(String::compareTo))
-                .thenComparing(AccountSubject::getId, Comparator.nullsLast(Long::compareTo)));
+                .comparing(AccountSubject::getSubjectCode, Comparator.nullsFirst(String::compareTo)).reversed()
+                .thenComparing(AccountSubject::getId, Comparator.nullsFirst(Long::compareTo)).reversed());
 
         Map<Long, AccountSubjectVo> subjectVoMap = new LinkedHashMap<>();
         for (AccountSubject subject : sortedSubjects) {

--
Gitblit v1.9.3