From 157d1e46bf12fe08ef4f25a951689d1bf45d959f Mon Sep 17 00:00:00 2001
From: Ethan-Zhang <ethanzhang55@outlook.com>
Date: Thu, 27 Nov 2025 18:40:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87senderId=E5=88=A4=E6=96=AD=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=80=85=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了MessageDetail.vue中判断消息发送者的逻辑：
- 原逻辑通过receiverId判断，但申请消息中receiverId可能为特殊值（如'-'或'all'）
- 改为通过senderId判断当前用户是否为发送者
- 修复后团队管理员能正确看到'用户A申请加入团队X'，而非'您申请加入团队X'
---
 .../dialogue/components/MessageDetail.vue     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/dialogue/components/MessageDetail.vue b/src/views/dialogue/components/MessageDetail.vue
index aceff82..6a467c6 100644
--- a/src/views/dialogue/components/MessageDetail.vue
+++ b/src/views/dialogue/components/MessageDetail.vue
@@ -108,27 +108,28 @@ const POLLING_INTERVAL = 30000; // 30秒
 // 将后端数据转换为前端显示格式
 const transformUserMsgToMessage = (userMsg: UserMsg): Message => {
   // 判断当前用户是发送者还是接收者
-  const currentUsername = userinfo.value.username;
-  const isReceiver = userMsg.receiverId === currentUsername;
+  // 通过比较 senderId 来判断：如果当前用户是发送者，则 senderId 等于当前用户名
+  const currentUserId = userinfo.value.user_sub;
+  const isSender = userMsg.senderId === currentUserId;
   
   let content = '';
   if (userMsg.msgType === 'invitation') {
     // 邀请消息
-    if (isReceiver) {
-      // 当前用户是接收者
-      content = `${userMsg.senderName || '用户'} 邀请您加入团队 "${userMsg.teamName}"`;
-    } else {
+    if (isSender) {
       // 当前用户是发送者
       content = `您邀请 ${userMsg.receiverName || '用户'} 加入团队 "${userMsg.teamName}"`;
+    } else {
+      // 当前用户是接收者
+      content = `${userMsg.senderName || '用户'} 邀请您加入团队 "${userMsg.teamName}"`;
     }
   } else {
     // 申请消息
-    if (isReceiver) {
-      // 当前用户是接收者
-      content = `${userMsg.senderName || '用户'} 申请加入团队 "${userMsg.teamName}"`;
-    } else {
+    if (isSender) {
       // 当前用户是发送者
       content = `您申请加入团队 "${userMsg.teamName}"`;
+    } else {
+      // 当前用户是接收者
+      content = `${userMsg.senderName || '用户'} 申请加入团队 "${userMsg.teamName}"`;
     }
   }
   
-- 
Gitee