|
|
@@ -404,13 +404,14 @@
|
|
|
<if test="organIds != null and organIds != ''">
|
|
|
LEFT JOIN sys_user su ON su.id_ = aum.user_id_
|
|
|
</if>
|
|
|
- WHERE aum.category_id_ = vgc.id_
|
|
|
- <if test="userId != null">
|
|
|
- AND s.teacher_id_ = #{userId}
|
|
|
- </if>
|
|
|
- <if test="organIds != null and organIds != ''">
|
|
|
- AND FIND_IN_SET(su.organ_id_,#{organIds})
|
|
|
- </if>
|
|
|
+ <where>
|
|
|
+ <if test="userId != null">
|
|
|
+ AND s.teacher_id_ = #{userId}
|
|
|
+ </if>
|
|
|
+ <if test="organIds != null and organIds != ''">
|
|
|
+ AND FIND_IN_SET(su.organ_id_,#{organIds})
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
GROUP BY vgc.id_
|
|
|
</select>
|
|
|
<resultMap id="ActivityUserDto" type="com.ym.mec.biz.dal.dto.ActivityUserDto">
|
zouxuan