From 52b31d09cd0270e2b488b82da39ebdf4ade3d3f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:48:55 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/mapper/modules/MallTeamLeaderMapper.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index dc64fac..f95435a 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -113,15 +113,7 @@
         inner join mall_order_item b on a.id=b.order_id
         inner join mall_member c on a.take_unique_code=c.invite_id
         <where>
-            a.delivery_type = 1
-            and c.id=#{record.memberId}
-            <if test="record.query != null and record.query != ''">
-                and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
-                    or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
-                    or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
-                    or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
-                    )
-            </if>
+            c.id=#{record.memberId}
             <if test="record.status == 4 and record.status != 0">
                 and a.status = 4
             </if>
@@ -137,9 +129,17 @@
             <if test="record.status == 0">
                 and a.status in (2,3,4)
             </if>
+            <if test="record.query != null and record.query != ''">
+                and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
+                    or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
+                    or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
+                    or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
+                    )
+            </if>
             <if test="record.orderType != null">
                 and a.order_type=#{record.orderType}
             </if>
+            and a.delivery_type = 1
         </where>
         order by a.created_time desc
     </select>

--
Gitblit v1.9.1