From 0e0ef19a7bd74b2fde0089c28ad3d61d0bc2d911 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@example.com>
Date: 星期五, 22 五月 2026 21:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 961d783..2f782ff 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -76,6 +76,9 @@
<if test="req.returnNo != null and req.returnNo != ''">
and pro.no like concat('%',#{req.returnNo},'%')
</if>
+ <if test="req.supplierId != null">
+ and pro.supplier_id = #{req.supplierId}
+ </if>
<if test="req.supplierName != null and req.supplierName != ''">
and sm.supplier_name like concat('%',#{req.supplierName},'%')
</if>
--
Gitblit v1.9.3