|
@@ -1757,7 +1757,7 @@
|
|
fs_course_watch_log l
|
|
fs_course_watch_log l
|
|
LEFT JOIN company_user ON l.company_user_id = company_user.user_id
|
|
LEFT JOIN company_user ON l.company_user_id = company_user.user_id
|
|
where
|
|
where
|
|
- l.log_type != 3
|
|
|
|
|
|
+ l.log_type != 3 and send_type = 1
|
|
<if test="userId != null and userId != 0 ">
|
|
<if test="userId != null and userId != 0 ">
|
|
and (l.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
and (l.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
</if>
|
|
</if>
|
|
@@ -1781,7 +1781,7 @@
|
|
fs_course_watch_log l
|
|
fs_course_watch_log l
|
|
LEFT JOIN company_user ON l.company_user_id = company_user.user_id
|
|
LEFT JOIN company_user ON l.company_user_id = company_user.user_id
|
|
where
|
|
where
|
|
- l.log_type = 2
|
|
|
|
|
|
+ l.log_type = 2 and send_type = 1
|
|
<if test="userId != null and userId != 0 ">
|
|
<if test="userId != null and userId != 0 ">
|
|
and (l.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
and (l.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
|
|
</if>
|
|
</if>
|