大屏类型在租次数修改

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