zyp

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -1667,7 +1667,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                 finishLogsToUpdate.add(finishLog);
 
                 if (finishTemp == null) {
-                    log.error("完课模板不存在: " + finishLog.getCompanyUserId() + ", " + finishLog.getVideoId());
+//                    log.error("完课模板不存在: " + finishLog.getCompanyUserId() + ", " + finishLog.getVideoId());
                     continue;
                 }
 

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

@@ -382,18 +382,30 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     }
 
     private R handleRoom(FsUserCourseVideoAddKfUParam param,FsUser user) {
-        if (user.getQwExtId()==null){
+        //查询客户列表
+        List<QwExternalContact> contacts = qwExternalContactMapper.selectQwExternalContactListVOByfsUserId(user.getUserId());
+        if (contacts.isEmpty()){
             return R.error("未注册");
         }
-        param.setQwExternalId(user.getQwExtId());
-        //查询是否有添加客服
-        QwExternalContact externalContact = qwExternalContactMapper.selectQwExternalContactById(param.getQwExternalId());
-        if (externalContact==null){
-            return R.error("客户不存在！");
-        }
-        if (!externalContact.getQwUserId().equals(param.getUserId())){
-            return R.error("无权限观看，添加群主非本群主");
+        //找出对应销售匹配的客户
+        QwExternalContact matchedContact = contacts.stream()
+                .filter(contact -> contact.getQwUserId().equals(Long.parseLong(param.getQwUserId())))
+                .findFirst()
+                .orElse(null);
+
+        if (matchedContact==null){
+            return R.error("无权限观看，未添加本群主");
         }
+
+        param.setQwExternalId(matchedContact.getId());
+//        //查询是否有添加客服
+//        QwExternalContact externalContact = qwExternalContactMapper.selectQwExternalContactById(param.getQwExternalId());
+//        if (externalContact==null){
+//            return R.error("客户不存在！");
+//        }
+//        if (!externalContact.getQwUserId().equals(param.getUserId())){
+//            return R.error("无权限观看，添加群主非本群主");
+//        }
         FsCourseWatchLog log = courseWatchLogMapper.getWatchCourseVideoByExt(param.getQwExternalId(), param.getVideoId(),param.getQwUserId());
         if (log==null){
             createWatchLog(param);

fs-service/src/main/resources/mapper/sop/SopUserLogsMapper.xml

@@ -192,7 +192,6 @@
         where a.start_time <= Now()
           and a.status = 1
           and b.send_type != 4 and b.status in (2,3)
-        and sop_id = 'b3d86baabe5b58b25977c48853ea0a34'
     </select>
 
     <select id="meetsTheRatingByUserInfo"   resultMap="SopUserLogsResult">