From 9ea9ff4aa6bb969158dd66059aa6bc6d0922fb15 Mon Sep 17 00:00:00 2001
From: liuwei <liuwei@wdtrgf.com.cn>
Date: Wed, 7 May 2025 17:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/contacts_db.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/db/contacts_db.py b/db/contacts_db.py
index 7264e31..a1d3e49 100644
--- a/db/contacts_db.py
+++ b/db/contacts_db.py
@@ -295,10 +295,18 @@ class ContactsDBOperator(BaseDBOperator):
             contacts_dict = {}
             for result in results:
                 user_name = result.get('user_name')
-                # 优先使用备注，其次是昵称，最后是微信ID
-                display_name = result.get('remark') or result.get('nick_name') or user_name
+                remark = result.get('remark')
+                nick_name = result.get('nick_name')
+                # 优先使用备注，其次是昵称，最后是微信ID。如果存在remark,则用remark(nick_name)
+                if remark:
+                    if nick_name and remark != nick_name:
+                        display_name = f"{remark}({nick_name})"
+                    else:
+                        display_name = remark
+                else:
+                    display_name = nick_name or user_name
                 contacts_dict[user_name] = display_name
-                
+
             self.LOG.info(f"从数据库获取了 {len(contacts_dict)} 个联系人信息")
             return contacts_dict
         except Exception as e: