From 380854ead73ee1a3da277fd48f7f692f17e4781e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 11:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/resources/mapping/TOrderMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index 3c6903d..b0b423f 100644
--- a/manage/src/main/resources/mapping/TOrderMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderMapper.xml
@@ -71,13 +71,19 @@
             and orderMoney between #{query.startMoney} and #{query.endMoney}
         </if>
         <if test="query.realName != null and query.realName != ''">
-            and `name` like concat('%',#{query.realName},'%')
+            and realName like concat('%',#{query.realName},'%')
+        </if>
+          <if test="query.phone != null and query.phone != ''">
+            and phone like concat('%',#{query.phone},'%')
         </if>
         <if test="query.storeId != null">
             and storeId = #{query.storeId}
         </if>
         <if test="query.sysId != null">
             and sysId = #{query.sysId}
+        </if>
+          <if test="query.userId != null">
+            and userId = #{query.userId}
         </if>
         <if test="query.userIds != null and query.userIds.size()>0">
             AND userId IN
@@ -91,5 +97,6 @@
                 #{id}
             </foreach>
         </if>
+        order by createTime desc
     </select>
 </mapper>

--
Gitblit v1.7.1