|
|
@@ -399,20 +399,17 @@
|
|
|
SELECT CASE WHEN vgc.id_ IS NULL THEN '网管课' ELSE vgc.name_ END name_,
|
|
|
CASE WHEN vgc.id_ IS NULL THEN 0 ELSE vgc.id_ END id_,COUNT(DISTINCT aum.user_id_) num_,
|
|
|
CASE WHEN vgc.id_ IS NULL THEN 1 ELSE vgc.student_num_ END student_num_
|
|
|
- FROM (select category_id_,user_id_ from activity_user_mapper aum WHERE aum.sub_course_num_ > 0 AND aum.return_fee_ = 0
|
|
|
+ FROM (select category_id_,user_id_,teacher_id_ from activity_user_mapper aum WHERE aum.sub_course_num_ > 0 AND aum.return_fee_ = 0
|
|
|
UNION ALL
|
|
|
- select give_category_id_ category_id_,user_id_ from activity_user_mapper aum
|
|
|
+ select give_category_id_ category_id_,user_id_,teacher_id_ from activity_user_mapper aum
|
|
|
WHERE aum.sub_give_course_num_ > 0 AND aum.return_fee_ = 0) aum
|
|
|
LEFT JOIN vip_group_category vgc ON aum.category_id_ = vgc.id_
|
|
|
- <if test="userId != null">
|
|
|
- LEFT JOIN student s ON s.user_id_ = aum.user_id_
|
|
|
- </if>
|
|
|
<if test="organIds != null and organIds != ''">
|
|
|
LEFT JOIN sys_user su ON su.id_ = aum.user_id_
|
|
|
</if>
|
|
|
<where>
|
|
|
<if test="userId != null">
|
|
|
- AND s.teacher_id_ = #{userId}
|
|
|
+ AND aum.teacher_id_ = #{userId}
|
|
|
</if>
|
|
|
<if test="organIds != null and organIds != ''">
|
|
|
AND FIND_IN_SET(su.organ_id_,#{organIds})
|
zouxuan