From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +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