From dde6b22ac257f6d432d9e38f80a0df77f9eb157a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:18:10 +0800
Subject: [PATCH] 军歌化工不合格台账

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

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..42414a1 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -28,12 +28,19 @@
         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 != ''">
-            and approve_status = #{req.approveStatus}
-        </if>
+        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 or req.approveStatus == 0">
+                and approve_status = #{req.approveStatus}
+            </if>
+            <if test="req.approveType != null ">
+                and approve_type = #{req.approveType}
+            </if>
+        </where>
+        order by approve_process.create_time desc
     </select>
 </mapper>

--
Gitblit v1.9.3