|
|
|
@@ -155,7 +155,7 @@ |
|
|
|
<if test=" null != id ">and `id` = #{id}</if> |
|
|
|
<if test=" null != fromId ">and `from_id` = #{fromId}</if> |
|
|
|
<if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if> |
|
|
|
<if test=" null != isPrivateMerchant and '' != isPrivateMerchant">and `is_private_merchant` = #{isPrivateMerchant}</if> |
|
|
|
<if test=" null != isPrivateMerchant">and `is_private_merchant` = #{isPrivateMerchant}</if> |
|
|
|
<if test=" null != price and '' != price">and `price` = #{price}</if> |
|
|
|
<if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if> |
|
|
|
<if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if> |
|
|
|
@@ -399,7 +399,7 @@ |
|
|
|
<if test=" null != contractNumber and '' != contractNumber"> |
|
|
|
and rc.`contract_number` = #{contractNumber} |
|
|
|
</if> |
|
|
|
<if test=" null != isPrivateMerchant and '' != isPrivateMerchant">and rc.`is_private_merchant` = #{isPrivateMerchant}</if> |
|
|
|
<if test=" null != isPrivateMerchant">and rc.`is_private_merchant` = #{isPrivateMerchant}</if> |
|
|
|
<if test=" null != rentId and '' != rentId"> |
|
|
|
and rc.`id` = #{rentId} |
|
|
|
</if> |
|
|
|
|