|
@@ -681,7 +681,7 @@
|
|
|
LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
|
|
|
LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
|
|
|
WHERE
|
|
|
- company_user.parent_id = #{userId}
|
|
|
+ (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
|
|
|
<if test="dateTag != null and dateTag !='' ">
|
|
|
<choose>
|
|
|
<when test = "dateTag == '今天'">
|
|
@@ -711,7 +711,7 @@
|
|
|
LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
|
|
|
LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
|
|
|
WHERE
|
|
|
- company_user.parent_id = #{userId}
|
|
|
+ (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
|
|
|
AND fs_course_answer_logs.is_right = 1
|
|
|
<if test="dateTag != null and dateTag !='' ">
|
|
|
<choose>
|
|
@@ -746,7 +746,7 @@
|
|
|
LEFT JOIN fs_user ON fs_user.user_id = fs_course_red_packet_log.user_id
|
|
|
LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
|
|
|
WHERE
|
|
|
- company_user.parent_id = #{userId}
|
|
|
+ (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
|
|
|
<if test="dateTag != null and dateTag !='' ">
|
|
|
<choose>
|
|
|
<when test = "dateTag == '今天'">
|