diff --git a/src/main/resources/mapper/CarModelMapper.xml b/src/main/resources/mapper/CarModelMapper.xml index 2abda4a..80fc764 100644 --- a/src/main/resources/mapper/CarModelMapper.xml +++ b/src/main/resources/mapper/CarModelMapper.xml @@ -28,11 +28,20 @@ zc_rent_car_rule r ON mp.car_rule_id = r.id AND r.del_flag = '0' AND r.status = '0' s.id = #{storeCarModelReq.storeId} - - AND r.deposit_free = #{storeCarModelReq.depositFree} - - - AND r.auto_deduct = #{storeCarModelReq.autoDeduct} + + AND ( + + + r.deposit_free = #{storeCarModelReq.depositFree} OR r.auto_deduct = #{storeCarModelReq.autoDeduct} + + + r.deposit_free = #{storeCarModelReq.depositFree} + + + r.auto_deduct = #{storeCarModelReq.autoDeduct} + + + ) AND cm.del_flag = '0' AND cm.status = '0'