sql拼接bug修复

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -891,13 +891,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company_user u ON o.company_user_id = u.user_id
         where i.product_id = #{productId}
         and o.`status` = 3
-        and
+
         <choose>
             <when test="queryType == null and queryType==1">
-                  (DATE_FORMAT(o.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+                and    (DATE_FORMAT(o.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
             </when>
             <when test="queryType != null and queryType==2">
-                  (DATE_FORMAT(o.delivery_send_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+                and     (DATE_FORMAT(o.delivery_send_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
             </when>
         </choose>
         <if test="userIds != null and userIds.length>0">AND o.company_user_id IN