diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 5438a28..2602147 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -99,7 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND hh.order_status = #{orderStatus}
         </if>
         <if test="startTime != null and endTime != null ">
-            AND hh.rent_begin_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
+            AND ((hh.rent_begin_time BETWEEN #{startTime} AND #{endTime})
+            OR (hh.rent_end_time BETWEEN #{startTime} AND #{endTime})
+            OR (hh.rent_begin_time &lt; #{startTime} AND hh.rent_end_time > #{endTime}))
         </if>
         <if test="czcompanyName != null and czcompanyName != ''">
             AND c.company_name like concat('%',#{czcompanyName},'%')
@@ -169,8 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     sd1.dept_name AS companyName
                 FROM
                     sys_dept sd
-                        JOIN ( SELECT SUBSTRING_INDEX( ancestors, ',', 1 ) AS first_ancestor, dept_id FROM sys_dept ) AS subquery ON sd.dept_id = subquery.dept_id
-                        LEFT JOIN sys_dept sd1 ON sd1.parent_id = subquery.first_ancestor
+                        JOIN ( SELECT SUBSTRING_INDEX( ancestors, ',', 2 ) AS first_ancestor, dept_id FROM sys_dept ) AS subquery ON sd.dept_id = subquery.dept_id
+                        LEFT JOIN sys_dept sd1 ON sd1.dept_id = subquery.first_ancestor
             ) dept ON dept.deptId = su.dept_id
         WHERE
             mt.del_flag = '0' and moi.order_id = #{orderId} limit 1
@@ -201,5 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND bfi.file_type = 0
         WHERE
             moi.order_id = #{orderId}
+        GROUP BY hh.ma_id
     </select>
 </mapper>
\ No newline at end of file