From 61fef835f616f70ca35e1f046cdda82d6b68bfdc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 23 一月 2026 16:02:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/stock/StockOutRecordMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index df49648..b021e71 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -30,10 +30,16 @@
         LEFT JOIN sys_user as u on sor.create_user = u.user_id
         <where>
             <if test="params.timeStr != null and params.timeStr != ''">
-                and sor.create_time like concat('%',#{param.timeStr},'%')
+                and sor.create_time like concat('%',#{params.timeStr},'%')
             </if>
             <if test="params.productName != null and params.productName != ''">
-                and p.product_name like concat('%',#{param.productName},'%')
+                and p.product_name like concat('%',#{params.productName},'%')
+            </if>
+            <if test="params.type != null and params.type != ''">
+                and sor.type = #{params.type}
+            </if>
+            <if test="params.recordType != null and params.recordType != ''">
+                and sor.record_type = #{params.recordType}
             </if>
         </where>
         order by sor.id desc

--
Gitblit v1.9.3