|
|
@@ -42,7 +42,7 @@
|
|
|
min(t.create_time_) as createTime,
|
|
|
COUNT(DISTINCT t.id_) AS amount,
|
|
|
ar.reward_type_ AS rewardType,
|
|
|
- ar.unit_ AS unit,
|
|
|
+ IFNULL(ar.unit_, t.unit_) AS unit,
|
|
|
group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
|
|
|
FROM activity_user_reward t
|
|
|
left join activity_reward ar on ar.id_ = t.reward_id_
|
Eric