From a345e41b7bb8e95e698d75ad603fba8f912f8d98 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 22 九月 2025 16:03:18 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
index 1f435fa..8da6ced 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
@@ -130,14 +130,14 @@
             <if test="query.status != null">
                 and tom.status = #{query.status}
             </if>
-            <if test="query.orderNum != null and query.orderNum">
+            <if test="query.orderNum != null and query.orderNum != ''">
                 and tom.orderNum LIKE concat('%',#{query.orderNum},'%')
             </if>
             <if test="query.shopId != null">
                 and tom.shopId = #{query.shopId}
             </if>
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
-                AND (tom.createTime BETWEEN #{query.startTime} AND #{query.endTime})
+                AND (tom.mealTime BETWEEN #{query.startTime} AND #{query.endTime})
             </if>
             AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
             AND tom.isCover = 1
@@ -196,6 +196,7 @@
                 AND (tom.mealTime BETWEEN CONCAT(DATE_FORMAT(#{query.startTime},'%Y-%m-%d %H:%i:%s'),' 00:00:00')
                     AND CONCAT(DATE_FORMAT(#{query.endTime},'%Y-%m-%d %H:%i:%s'),' 23:59:59'))
             </if>
+            AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>
         ORDER BY tom.mealTime DESC
     </select>

--
Gitblit v1.7.1