From 84d076834a4202c48a020a83f1eee8082c85e0d9 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 9 Dec 2025 14:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=83=E5=B0=94=E7=8E=9B=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/ecss/CoDelMapper.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 01d55c45..80aa7083 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -27,9 +27,6 @@
              <if test="query.walMartOrderFlag == 'true'">
                  AND a.walMartOrderFlag = 'Y'
              </if>
-             <if test="query.walMartOrderFlag == null or query.walMartOrderFlag == '' or query.walMartOrderFlag == 'false'">
-                 AND (a.walMartOrderFlag is null or a.walMartOrderFlag != 'Y')
-             </if>
             <if test = "query.startDate!= null">
                AND a.ready_date>= #{query.startDate}
             </if>
@@ -109,6 +106,12 @@
             <if test = "query.endDate!= null">
                 AND  #{query.endDate} >=a.ready_date
             </if>
+            <if test="query.walMartOrderFlag == 'true'">
+                AND a.walMartOrderFlag = 'Y'
+            </if>
+            <if test="query.walMartOrderFlag == null or query.walMartOrderFlag == '' or query.walMartOrderFlag == 'false'">
+                AND (a.walMartOrderFlag is null or a.walMartOrderFlag != 'Y')
+            </if>
         </where>
         order by a.createDate desc ,a.delNo desc
     </select>