From f83a37e714ddd264b9420921ea781b27c42418ae Mon Sep 17 00:00:00 2001
From: xuncha <1658671838@qq.com>
Date: Sat, 17 Jan 2026 06:27:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E6=98=B5=E7=A7=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/services/exportService.ts | 34 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/electron/services/exportService.ts b/electron/services/exportService.ts
index 6cb6c21..d0721ab 100644
--- a/electron/services/exportService.ts
+++ b/electron/services/exportService.ts
@@ -1024,26 +1024,32 @@ class ExportService {
           // 群消息
           senderWxid = msg.senderUsername
           
-          // 用 getContactInfo 获取正确的显示名（昵称）
-          const senderInfo = await this.getContactInfo(msg.senderUsername)
-          senderNickname = senderInfo.displayName || msg.senderUsername
-          
-          // 用 getContact 获取备注
+          // 用 getContact 获取联系人详情，分别取昵称和备注
           const contactDetail = await wcdbService.getContact(msg.senderUsername)
-          if (contactDetail.success && contactDetail.contact && contactDetail.contact.remark) {
-            senderRemark = contactDetail.contact.remark
+          if (contactDetail.success && contactDetail.contact) {
+            // nickName 才是真正的昵称
+            senderNickname = contactDetail.contact.nickName || msg.senderUsername
+            senderRemark = contactDetail.contact.remark || ''
             // 身份：有备注显示备注，没有显示昵称
-            senderRole = contactDetail.contact.remark
+            senderRole = senderRemark || senderNickname
           } else {
+            senderNickname = msg.senderUsername
+            senderRemark = ''
+            senderRole = msg.senderUsername
+          }
+        } else {
+          // 单聊对方消息 - 用 getContact 获取联系人详情
+          senderWxid = sessionId
+          const contactDetail = await wcdbService.getContact(sessionId)
+          if (contactDetail.success && contactDetail.contact) {
+            senderNickname = contactDetail.contact.nickName || sessionId
+            senderRemark = contactDetail.contact.remark || ''
+            senderRole = senderRemark || senderNickname
+          } else {
+            senderNickname = sessionInfo.displayName || sessionId
             senderRemark = ''
             senderRole = senderNickname
           }
-        } else {
-          // 单聊对方消息
-          senderRole = sessionInfo.displayName || sessionId
-          senderWxid = sessionId
-          senderNickname = sessionInfo.displayName || sessionId
-          senderRemark = ''
         }
 
         const row = worksheet.getRow(currentRow)