From 4667d1e9ac2b01a6753eb8a87fb721051bf07ac4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 13:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

---
 manage/src/main/resources/mapping/TOrderAftersalesMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
index bcd69d1..3bfaa97 100644
--- a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
@@ -27,8 +27,8 @@
                toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.name as storeName, o.orderMoney
         from t_order_aftersales toa
         left join t_app_user tau on toa.sysId = tau.id
-        left join t_store ts on toa.storeId = ts.id
         left join t_order o on toa.orderId = o.id
+        left join t_store ts on o.storeId = ts.id
         <where>
             <if test="query.name != null and query.name != ''">
                 and tau.name like concat('%',#{query.name},'%')
@@ -37,7 +37,7 @@
                 and tau.phone like concat('%',#{query.phone},'%')
             </if>
             <if test="query.storeId != null">
-                and toa.storeId = #{query.phone}
+                and o.storeId = #{query.phone}
             </if>
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                 and toa.createTime between #{query.startTime} and #{query.endTime}

--
Gitblit v1.7.1