From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index da0d5f7..0ab3d21 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,4 +27,13 @@
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 or req.approveStatus == 0">
+ and approve_status = #{req.approveStatus}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3