From 5224b79436b16039d07a981029e330f48b3c7708 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 10:05:46 +0800
Subject: [PATCH] fix: 日期格式转换、生产订单缺少查询条件

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

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

--
Gitblit v1.9.3