From 14de446d42a23f8823f56ef79214e0d0d634adaa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 16:57:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index ea8e9f9..df49648 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -15,21 +15,26 @@
<result column="update_time" property="updateTime" />
<result column="create_user" property="createUser" />
<result column="update_user" property="updateUser" />
- <result column="tenant_id" property="tenantId" />
</resultMap>
<select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
SELECT
- sor.*
- pm.product_name as productName,
+ sor.*,
+ p.product_name as productName,
pm.model,
- pm.unit
+ pm.unit,
+ u.nick_name as createBy
FROM stock_out_record as sor
- LEFT JOIN product_models as pm on sor.product_model_id = pm.id
+ LEFT JOIN product_model as pm on sor.product_model_id = pm.id
+ LEFT JOIN product as p on pm.product_id = p.id
+ 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},'%')
</if>
+ <if test="params.productName != null and params.productName != ''">
+ and p.product_name like concat('%',#{param.productName},'%')
+ </if>
</where>
order by sor.id desc
</select>
--
Gitblit v1.9.3