From 7ffe22ec9a04e5f225920e275a1b18ae76ba7f75 Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Sun, 5 Nov 2023 23:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E4=B9=B1?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/view/Home.vue |  5 +++--
 im-uniapp/App.vue       | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index f3202ef..d70cdbb 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -145,11 +145,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						// 标记这条消息是不是自己发的
 						msgInfo.selfSend = msgInfo.sendId == this.$store.state.userStore.userInfo.id;
 						let groupId = msgInfo.groupId;
 						let group = this.$store.state.groupStore.groups.find((g) => g.id == groupId);
-						this.handleGroupMessage(group,msgInfo);
+						if(group){
+							this.insertGroupMessage(group,msgInfo);
+						}
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取
diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index be4ed1d..f7a4b71 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -69,7 +69,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						this.handlePrivateMessage(msgInfo);
+						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
+						let friendId = msgInfo.selfSend ? msgInfo.recvId : msgInfo.sendId;
+						let friend = store.state.friendStore.friends.find((f) => f.id == friendId);
+						if(friend){
+							this.insertPrivateMessage(friend,msgInfo);
+						}	
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取
@@ -86,7 +91,12 @@
 					method: 'get'
 				}).then((msgInfos) => {
 					msgInfos.forEach((msgInfo) => {
-						this.handleGroupMessage(msgInfo);
+						msgInfo.selfSend = msgInfo.sendId == store.state.userStore.userInfo.id;
+						let groupId = msgInfo.groupId;
+						let group = store.state.groupStore.groups.find((g) => g.id == groupId);
+						if(group){
+							this.insertGroupMessage(group,msgInfo);
+						}
 					})
 					if (msgInfos.length == 100) {
 						// 继续拉取