From b926cc0c99d75507516e04cee878e5bfe614fd8c Mon Sep 17 00:00:00 2001
From: liuwei <liuwei@wdtrgf.com.cn>
Date: Thu, 20 Feb 2025 14:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BA=86=20=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=80=BB=E8=A1=8C=E6=95=B0=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=A4=84=E7=90=86=E4=BA=86?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=8F=82=E4=B8=8E=E8=80=85=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=80=80=E7=BE=A4=E6=97=B6=E6=97=A0=E6=98=B5=E7=A7=B0=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 message_storage/message_to_db.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/message_storage/message_to_db.py b/message_storage/message_to_db.py
index d6a5adb..6ac4a2f 100644
--- a/message_storage/message_to_db.py
+++ b/message_storage/message_to_db.py
@@ -70,12 +70,14 @@ def get_messages(group_id, all_contacts: dict):
 
             # 提取结果并组成带逗号的字符串
             result = []
+            if cursor.rowcount > 0:
+                result.append(f"聊天记录总行数：{cursor.rowcount}")
             for row in cursor.fetchall():
                 group_id = row[0]
                 timestamp = row[1]
                 sender = row[2]
                 content = row[3]
-                result.append(f"{group_id},{timestamp},{all_contacts[sender]},{content}")
+                result.append(f"{group_id},{timestamp},{all_contacts.get(sender, sender)},{content}")
 
             # 将列表中的字符串连接成一个最终的结果
             result_str = "\n".join(result)