diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
index db925474..d989d1ac 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -687,34 +687,27 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
   };
 
   const handQuote = (messageData: ChatRecord) => {
-    //判断如果是用户
     const isGroupUser = !!currentContract?.chatroomId;
+    const isSend = !!messageData.isSend;
+    const nickname = currentContract?.nickname || "";
+    const SEPARATOR = "\n----------------------------------\n";
+
+    const rawContent = messageData.content || "";
 
-    const isSend = messageData.isSend; //是否为我方发送
-    const nickname = currentContract.nickname;
-    let sendMessageText = "";
     if (isGroupUser) {
-      const GroupNickname = messageData.sender.nickname;
-      const content = messageData.content.replace(
-        `${messageData.sender.wechatId}:\n`,
+      const groupNickname = messageData?.sender?.nickname || "";
+      // 群消息里，非本人消息通常以 "wechatId:\n" 开头，清理前缀
+      const content = rawContent.replace(
+        `${messageData?.sender?.wechatId}:\n`,
         "",
       );
-      if (isSend) {
-        sendMessageText = `${messageData.content}\n----------------------------------\n`;
-      } else {
-        console.log(messageData);
-        sendMessageText = `@${GroupNickname}：${content}\n----------------------------------\n`;
-      }
-    } else {
-      if (isSend) {
-        sendMessageText = `${messageData.content}\n----------------------------------\n`;
-      } else {
-        sendMessageText = `@${nickname}：${messageData.content}\n----------------------------------\n`;
-      }
-      //当前用户的昵称
+      const text = isSend ? rawContent : `@${groupNickname}：${content}`;
+      updateQuoteMessageContent(`${text}${SEPARATOR}`);
+      return;
     }
 
-    updateQuoteMessageContent(sendMessageText);
+    const text = isSend ? rawContent : `@${nickname}：${rawContent}`;
+    updateQuoteMessageContent(`${text}${SEPARATOR}`);
   };
 
   const handCommad = (action: string) => {