Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -143,7 +143,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
     private static final String SHORT_LINK_PREFIX = "/courseH5/pages/course/learning?s=";
     // 排除看课数量限制的公司集合
     private static final Set<String> EXCLUDE_PROJECTS = new HashSet<>(Arrays.asList(
-            "福本源", "宽益堂", "叮当国医"
+            "福本源", "宽益堂", "叮当国医", "易行健"
     ));
     @Autowired
     ICompanyService companyService;
@@ -1002,6 +1002,9 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                     log.info("用户：" + param.getVideoId());
                     log.info("企微用户：" + param.getQwUserId());
                     param.setQwExternalId(UnionEXt.getId());
+//                    param.setQwUserId(String.valueOf(UnionEXt.getQwUserId()));
+//                    param.setCompanyUserId(UnionEXt.getCompanyUserId());
+//                    param.setCompanyId(UnionEXt.getCompanyId());
                     FsCourseWatchLog log = courseWatchLogMapper.getWatchCourseVideoByExt(UnionEXt.getId(), param.getVideoId(), param.getQwUserId());
                     if (log == null) {
                         param.setUserId(user.getUserId());