From 682f7d0493db57c7915a1a1e7defcadb8bef39de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 13 Nov 2025 10:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E9=83=A8=E4=BF=A1=E6=89=98=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8A=A5=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalary.properties                     | 2 +-
 resource/wiki/二开/xbxtSalaryReport.properties                 | 3 ++-
 .../engine/salary/mapper/salarybill/SalarySendInfoMapper.xml   | 2 +-
 .../salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties
index b539fda3a..565b5b1f7 100644
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.2510.01s
+version=3.0.3.2510.01s
 openFormulaForcedEditing=false
\ No newline at end of file
diff --git a/resource/wiki/二开/xbxtSalaryReport.properties b/resource/wiki/二开/xbxtSalaryReport.properties
index d2be45d6a..586038a0e 100644
--- a/resource/wiki/二开/xbxtSalaryReport.properties
+++ b/resource/wiki/二开/xbxtSalaryReport.properties
@@ -1 +1,2 @@
-salaryItemIds=1695204436120,1695204436123,1695204436124,1695204436125,1695204436126,1695204436127,1695204436128,1695204436129,1695204436130,1695204436131,1695204436132,1695204436133,1695204436134,1695204436135,1695204436136,
\ No newline at end of file
+## salaryItemIds=1695204436120,1695204436123
+salaryItemIds=
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index f67762cbf..8ac4caae7 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -746,7 +746,7 @@
                 #{salaryMonth}
             </foreach>
         </if>
-        ORDER BY id DESC
+        ORDER BY salary_month DESC
     </select>
     <select id="getNeedSendInfoList" resultType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
         select id,salary_send_id
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index 1375c8e85..5639b5c75 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -414,6 +414,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
                 .employeeIds(Collections.singletonList((long) user.getUID()))
                 .build();
         List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam);
+        salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a,b)->-a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList());
 
         // 获取薪资核算结果
         SalaryStatisticsEmployeeDetailResultDTO salaryStatisticsEmployeeDetailResult = getSalaryStatisticsEmployeeService(user).getDetailSalaryAcctResultByAcctEmp(salaryAcctEmployeeList);