租车订单添加车牌查询

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -113,12 +113,7 @@
     <select id="listOrder" parameterType="Map" resultMap="orderListMap">
         select b.*
         from base_order b
-        LEFT JOIN
-        (SELECT * FROM order_rent_vehicle_detail <if test="vehicleIds != null and vehicleIds.size() > 0">
-        WHERE `vehicle_id` IN <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
-           #{vehicleId}
-    </foreach>
-    </if>) r on r.order_id = b.id
+        LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         LEFT JOIN order_tour_detail t on t.order_id = b.id
         LEFT JOIN order_member_detail m on m.order_id = b.id
         <where>
@@ -147,6 +142,11 @@
                 and (r.start_time between #{startTime} and #{endTime}
                 or t.start_time between #{startTime} and #{endTime})
             </if>
+            <if test="vehicleIds != null and vehicleIds.size() > 0">
+                AND r.vehicle_id IN <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
+                #{vehicleId}
+            </foreach>
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (r.start_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">