From 7e88cd71bad601421b70a191cdab1af7e85ef094 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 10 五月 2026 17:08:04 +0800
Subject: [PATCH] feat: 审批数据根本申请日期进行倒序

---
 src/main/resources/mapper/approve/ApproveProcessMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..f60d132 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,13 +27,18 @@
         approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
         approve_delete,tenant_id,approve_type,approve_remark
     </sql>
+
     <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
         select * from approve_process where approve_delete = 0
         <if test="req.approveId != null and req.approveId != ''">
             and approve_id like concat('%',#{req.approveId},'%')
         </if>
-        <if test="req.approveStatus != null and req.approveStatus != ''">
+        <if test="req.approveStatus != null or req.approveStatus == 0">
             and approve_status = #{req.approveStatus}
         </if>
+        <if test="req.approveType != null ">
+            and approve_type = #{req.approveType}
+        </if>
+        order by approve_time desc
     </select>
 </mapper>

--
Gitblit v1.9.3