From 50a4660f10d6f106d0eab4af626bd5a02e877f4f Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Fri, 25 Apr 2025 11:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=B1=BB=E5=9E=8B=E5=9C=A8?=
 =?UTF-8?q?=E7=A7=9F=E6=AC=A1=E6=95=B0=E4=BF=AE=E6=94=B9?=
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 5cab1c8..b78e4e1 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
@@ -1292,7 +1292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             mdi.device_name as deviceName,mt.type_name as modelName,
             mt.lease_price as dayLeasePrice,
-            count(DISTINCT(mrd.ma_id)) as rentNum
+            count(mrd.ma_id) as rentNum
         FROM
             ma_order_details mrd
             LEFT JOIN  ma_dev_info mdi on mdi.ma_id = mrd.ma_id
@@ -1300,15 +1300,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
         WHERE
             mdi.is_active = '1'
-          AND mdi.ma_status = '3'
 
-        GROUP BY mrd.ma_id
         <if test="keyWord != null and keyWord != ''">
             AND (
             mdi.device_name like concat('%',#{keyWord},'%') or
             mt2.type_name like concat('%',#{keyWord},'%')
             )
         </if>
+        GROUP BY mrd.ma_id
+
     </select>
     <select id="getDevLeasingNumList" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
         SELECT