From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Thu, 31 Jul 2025 17:18:47 +0800 Subject: [PATCH] Merge branch 'pxb' into xin --- oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml index 220b066..d8db864 100644 --- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml +++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml @@ -83,7 +83,10 @@ <if test="criteria.orderId != null"> and order_id = #{criteria.orderId} </if> - <if test="criteria.orderNum != null"> + <if test="criteria.phone != null"> + and phone = #{criteria.phone} + </if> + <if test="criteria.orderNum != null"> and order_num = #{criteria.orderNum} </if> <if test="criteria.merchantId != null"> -- Gitblit v1.9.3