|
@@ -79,10 +79,14 @@
|
|
|
FROM
|
|
FROM
|
|
|
ac_activity_registration a
|
|
ac_activity_registration a
|
|
|
JOIN z_user z ON z.id = a.user_id
|
|
JOIN z_user z ON z.id = a.user_id
|
|
|
|
|
+ WHERE
|
|
|
|
|
+ a.del_flag = 0
|
|
|
|
|
+ AND a.activity_id = #{activityId}
|
|
|
) zuser ON reg.user_id = zuser.id
|
|
) zuser ON reg.user_id = zuser.id
|
|
|
AND reg.user_type = zuser.type
|
|
AND reg.user_type = zuser.type
|
|
|
WHERE
|
|
WHERE
|
|
|
- reg.activity_id = #{activityId}
|
|
|
|
|
|
|
+ reg.del_flag = 0
|
|
|
|
|
+ AND reg.activity_id = #{activityId}
|
|
|
order by
|
|
order by
|
|
|
zuser.name,reg.create_time desc
|
|
zuser.name,reg.create_time desc
|
|
|
</select>
|
|
</select>
|