From cf7478fa2339196ffd88d24f1149c192c3f0f0e3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 18 八月 2025 10:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'

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

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 3104940..33b29a9 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -32,5 +32,11 @@
         <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>
     </select>
 </mapper>

--
Gitblit v1.9.3