Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

yfh 4 дней назад
Родитель
Сommit
af8ec8dff5

+ 1 - 1
fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -256,7 +256,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
 //            " LEFT JOIN fs_course_red_packet_log fcr on o.user_id = fcr.user_id and fcr.video_id = o.video_id" + //会有笛卡尔积问题
             "</if>\n" +
             "LEFT JOIN fs_user_course_video v on v.video_id=o.video_id \n" +
-            "LEFT JOIN fs_user_course uc on uc.course_id=v.course_id\n" +
+            "LEFT JOIN fs_user_course uc on uc.course_id=o.course_id\n" +
             "<if test= 'sendType == 1 '> " +
             " LEFT JOIN company_user cu on cu.user_id=o.company_user_id\n" +
             "</if>\n" +