Skip to content

C
cloud-platform
Commit 1fa7d5bd authored by hanfeng's avatar hanfeng
Browse files
Options

解决冲突

parent 53b57bbf
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @ 1fa7d5bd
......@@ -263,11 +263,11 @@
FROM
base_order b1
LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id
LEFT JOIN vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
LEFT JOIN vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
LEFT JOIN vehicle.vehicle v1 ON v1.id = o1.vehicle_id
LEFT JOIN xxfc_vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
LEFT JOIN xxfc_vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
LEFT JOIN xxfc_vehicle.vehicle v1 ON v1.id = o1.vehicle_id
LEFT JOIN xxfc_third_platform.id_information a1 ON b1.user_id = a1.user_login_id
LEFT JOIN ag_admin_v1.app_user_login a2 ON a2.id = b1.user_id
LEFT JOIN ag_admin_v2.app_user_login a2 ON a2.id = b1.user_id
<where>
<if test="userIds != null and userIds.size() > 0">
and b1.user_id in
......
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