Skip to content

C
cloud-platform
Commit 83c4c96d authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

parents 5cc096ed 0e2ee64e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @ 83c4c96d
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
select b.* select b.*
from base_order b from base_order b
LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
where b.type = 1 and r.end_time >= unix_timestamp(now())*1000 where b.type = 1
<if test="userIds != null and userIds.size > 0"> <if test="userIds != null and userIds.size > 0">
and b.user_id in and b.user_id in
<foreach collection="userIds" item="id" open="(" separator="," close=")"> <foreach collection="userIds" item="id" open="(" separator="," close=")">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment