群的大通链

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

@@ -503,10 +503,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private R handleRoom(FsUserCourseVideoAddKfUParam param,FsUser user) {
         //查询客户列表
         List<QwExternalContact> contacts = qwExternalContactMapper.selectQwExternalContactListVOByfsUserId(user.getUserId());
-        log.info("查出来的企微客户数量："+contacts.size());
-        if (!contacts.isEmpty()){
+        List<QwExternalContact> nonNullContacts = contacts.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        log.info("查出来的企微客户数量："+nonNullContacts.size());
+        if (!nonNullContacts.isEmpty()){
             //找出对应销售匹配的客户
-            QwExternalContact matchedContact = contacts.stream()
+            QwExternalContact matchedContact = nonNullContacts.stream()
                     .filter(contact -> contact.getQwUserId().equals(Long.parseLong(param.getQwUserId())))
                     .findFirst()
                     .orElse(null);
@@ -523,7 +526,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 }
                 return R.error(567,"群聊通用链接").put("qwExternalId", matchedContact.getId());
             }else {
-                QwExternalContact contact = contacts.get(0);
+                QwExternalContact contact = nonNullContacts.get(0);
                 log.info("匹配到的第一个企微用户："+contact.getUserId());
                 log.info("企微id："+contact.getId());
                 log.info("用户："+param.getVideoId());

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -505,7 +505,9 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
     List<QwExternalContact> selectQwExternalContactByFsUserIdAndCompany(@Param("userId")Long userId,@Param("companyUserId") Long companyUserId);
 
     void updateQwExternalContactIsRePlyById(@Param("id")Long id);
-    @Select("select * from qw_external_contact where unionid = #{unionID} ")
+
+
+    @Select("select * from qw_external_contact where unionid = #{unionID} order by create_time asc limit 1 ")
     QwExternalContact selectQwExternalByUnionID(@Param("unionID")String unionID);
 
     @Select("SELECT max(id) FROM qw_external_contact where status <>'4' and unionid is NULL")