From 2b548896f09387e3b689fb1a7bc5ef85bb037ff5 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 2 Jan 2025 14:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=A3=85=E5=A4=87=E5=88=A9?=
 =?UTF-8?q?=E7=94=A8=E7=8E=87=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/material/device/DevInfoMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 3b173bf..6f84ded 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -523,7 +523,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null  and brand != ''"> and d.brand = #{brand}</if>
             <if test="modelName != null  and modelName != ''"> and d.model_name like concat('%', #{modelName}, '%')</if>
             <if test="companyId != null and companyId !=''"> and d.own_co = #{companyId}</if>
-            <if test="startTime != null and endTime != null">
+            <if test="startTime != null and endTime !='' and endTime != null and endTime !=''">
                 and d.update_time between #{startTime} and #{endTime}
             </if>
             <if test="keyWord != null and keyWord != ''">
@@ -960,9 +960,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sum(total_up_day) as totalUpDay,
             sum(total_lease_day) as totalLeaseDay
         FROM
-            bm_message
+            ma_dev_info
         WHERE
-            message_type = '3'
+            ma_status = '3'
     </select>
 
     <update id="updateTotalDevUpDay">