From 3f2c93e6d6db54032aa4d6f0673986a5dd3882f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 11:28:48 +0800
Subject: [PATCH] fix(accountSales): 财务管理的销售出库和销售退货
---
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 995ae0c..fef06f7 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,13 +27,16 @@
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 id="listPage" resultType="com.ruoyi.approve.vo.ApproveProcessVo">
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>
</select>
</mapper>
--
Gitblit v1.9.3