|
@@ -123,7 +123,7 @@
|
|
AND a.create_method != 'STANDARD'
|
|
AND a.create_method != 'STANDARD'
|
|
</if>
|
|
</if>
|
|
<if test="cardRuleId != '-1'">
|
|
<if test="cardRuleId != '-1'">
|
|
- AND a.card_rule_id = #{cardRuleId}
|
|
|
|
|
|
+ AND ((a.create_method = 'STANDARD' AND a.card_rule_id = #{cardRuleId}) or a.create_method != 'STANDARD')
|
|
</if>
|
|
</if>
|
|
</if>
|
|
</if>
|
|
order by a.id desc
|
|
order by a.id desc
|