Merge remote-tracking branch 'origin/master'

fs-ipad-task/src/main/java/com/fs/app/task/SendMsg.java

@@ -312,7 +312,7 @@ public class SendMsg {
                     List<QwSopCourseFinishTempSetting.Setting> settings = setting.getSetting().stream().filter(e -> "9".equals(e.getContentType())).collect(Collectors.toList());
                     if (!settings.isEmpty()) {
                         hasAppSend = true;
-                        boolean sendFlag = asyncSopTestService.asyncSendMsgBySopAppLinkNormalIM(settings, qwSopLogs.getCorpId(), user.getCompanyUserId(), qwSopLogs.getFsUserId(), qwSopLogs.getId());
+                        boolean sendFlag = asyncSopTestService.asyncSendMsgBySopAppLinkNormalIM(settings, qwSopLogs.getCorpId(), qwUser.getCompanyUserId(), qwSopLogs.getFsUserId(), qwSopLogs.getId());
                         if (sendFlag) {
                             successCount++;
                         }