From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <cuizf@fengyuntec.com> Date: 星期一, 02 九月 2024 20:18:52 +0800 Subject: [PATCH] Merge branch 'master' into master-v2 --- src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml index 1cabdc5..5a29bcd 100644 --- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml +++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml @@ -77,6 +77,10 @@ join t_order o on si.order_id = o.id left join t_station s on s.id = oi.station_id WHERE oi.deleted = 0 + <if test="condition.orderItemId != null and condition.orderItemId != ''"> + AND si.order_item_id = #{condition.orderItemId} + </if> + <if test="condition.orderId != null and condition.orderId != ''"> AND si.order_id = #{condition.orderId} </if> -- Gitblit v1.9.3