From 8aa642ecb435cf7c701923534b0b9dcb6b69f058 Mon Sep 17 00:00:00 2001
From: chen zida <chenzida@huashiai.com>
Date: Tue, 5 Dec 2023 17:30:38 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lld/im/service/message/service/MessageSyncService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
index c0dde2a..ab47d4d 100644
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
@@ -221,9 +221,9 @@ public class MessageSyncService {
                 .collect(Collectors.toMap(ImMessageHistoryEntity::getToId, x -> x));
         // 合并map到toId
         fromIdMap.forEach((key,value) -> {
-            toIdMap.merge(key,value,(x,y) -> {
-                if (value.getMessageKey() > y.getMessageKey()) return value;
-                return y;
+            toIdMap.merge(key,value,(v1,v2) -> {
+                if (v1.getMessageKey() > v2.getMessageKey()) return v1;
+                return v2;
             });
         });