From a5a0a3c29a97c807cda8846994d1d8df6adeb9e5 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
index a72896c..86f4724 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
@@ -22,8 +22,8 @@
<include refid="Base_Column_List"/>
from sh_order_operation_log
<where>
- <if test="criteria.userId != null">
- and user_id = #{criteria.userId}
+ <if test="criteria.username != null">
+ and username like concat('%',#{criteria.username},'%')
</if>
<if test="criteria.userType != null">
and user_type = #{criteria.userType}
@@ -35,6 +35,12 @@
AND operation_time BETWEEN #{criteria.operationTime[0]} AND #{criteria.operationTime[1]}
</if>
</where>
- order by log_id desc
+ order by log_id
+ </select>
+ <select id="getByOrderNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_operation_log
+ where order_num = #{orderNum} order by log_id
</select>
</mapper>
--
Gitblit v1.9.3