From b01f6b9d8165515463b2f112f823376df6c78fec Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 20 Mar 2024 11:52:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9what?=
 =?UTF-8?q?sappID=E4=B9=8B=E5=90=8E,=20=E8=8E=B7=E5=8F=96=E6=96=B0?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Components/ConversationsList.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx
index 408ea47..f1fed1b 100644
--- a/src/views/Conversations/Components/ConversationsList.jsx
+++ b/src/views/Conversations/Components/ConversationsList.jsx
@@ -55,7 +55,9 @@ const Conversations = ({ mobile }) => {
   const getOrderConversationList = async (colisn) => {
     const { whatsapp_phone_number } = switchToC;
     const whatsappID = coli_guest_WhatsApp || whatsapp_phone_number || '';
-    let findCurrentOrderChats = conversationsList.filter((item) => `${item.coli_sn}` === `${colisn}`);
+    // let findCurrentOrderChats = conversationsList.filter((item) => `${item.coli_sn}` === `${colisn}`);
+    // 使用opisn + whatsappID 判断, 解决订单修改whatsappID号码之后获取新会话, 登录账号此处省略
+    let findCurrentOrderChats = conversationsList.filter((item) => `${item.whatsapp_phone_number}` === `${whatsappID}`);
     let findCurrentIndex = isEmpty(findCurrentOrderChats) ? -1 : 0; // findCurrentOrderChats.length-1;
     let findCurrent = findCurrentOrderChats[findCurrentIndex];
     if (findCurrentIndex !== -1) {