| @@ -26,7 +26,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| id,tenant_id,parent_tenant_id, | id,tenant_id,parent_tenant_id, | ||||
| activity_item_id,`name`,grade,merchant_count, | |||||
| activity_item_id,`type`,`name`,grade,merchant_count, | |||||
| min_amount,max_amount,cash_back_ratio,price, | min_amount,max_amount,cash_back_ratio,price, | ||||
| money_rule,mall_share_rate,merchant_share_rate, | money_rule,mall_share_rate,merchant_share_rate, | ||||
| create_date,update_date | create_date,update_date | ||||
| @@ -50,6 +50,10 @@ | |||||
| and `activity_item_id` = #{activityItemId} | and `activity_item_id` = #{activityItemId} | ||||
| </if> | </if> | ||||
| <if test=" null != type "> | |||||
| and `type` = #{type} | |||||
| </if> | |||||
| <if test=" null != name "> | <if test=" null != name "> | ||||
| and `name` like concat('%', #{name},'%') | and `name` like concat('%', #{name},'%') | ||||
| </if> | </if> | ||||