| @@ -381,6 +381,9 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and o.`parent_tenant_id` = #{parentTenantId} | and o.`parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != composeOrderId "> | |||||
| and o.`compose_order_id` = #{composeOrderId} | |||||
| </if> | |||||
| <if test="orderStatus != null"> | <if test="orderStatus != null"> | ||||
| AND o.order_status = #{orderStatus} | AND o.order_status = #{orderStatus} | ||||
| </if> | </if> | ||||
| @@ -403,6 +406,10 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and o.`parent_tenant_id` = #{parentTenantId} | and o.`parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != composeOrderId "> | |||||
| and o.`compose_order_id` = #{composeOrderId} | |||||
| </if> | |||||
| <if test="id != null"> | <if test="id != null"> | ||||
| and o.id = #{id} | and o.id = #{id} | ||||
| </if> | </if> | ||||