2 İşlemeler 082357e533 ... 0f4be46206

Yazar SHA1 Mesaj Tarih
  zx 0f4be46206 Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929 1 hafta önce
  zx 3e7f33fcea add 1 hafta önce

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

@@ -540,8 +540,16 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 //            }
 //        }
         //一个都找不到
-        QwExternalContact UnionEXt = qwExternalContactMapper.selectQwExternalByUnionID(user.getUnionId());
-        if (UnionEXt!=null){
+        List<QwExternalContact> qwExternalContacts = qwExternalContactMapper.selectQwExternalByUnionID(user.getUnionId());
+
+        if (qwExternalContacts!=null&&qwExternalContacts.size()>0){
+            for (QwExternalContact qwExternalContact : qwExternalContacts) {
+                if (qwExternalContact.getFsUserId()==null || qwExternalContact.getFsUserId()!=0L ){
+                    qwExternalContact.setFsUserId(user.getUserId());
+                    qwExternalContactMapper.updateQwExternalContact(qwExternalContact);
+                }
+            }
+            QwExternalContact UnionEXt=qwExternalContacts.get(0);
             log.info("匹配到的第一个企微用户:"+UnionEXt.getUserId());
             log.info("企微id:"+UnionEXt.getId());
             log.info("用户:"+param.getVideoId());

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

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