From 12d8c39ccfb4bf70c3faf40934e6473be1cb9d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Thu, 4 Sep 2025 15:00:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(weChat):=20=E4=BF=AE=E6=AD=A3=E7=BE=A4?=
 =?UTF-8?q?=E8=81=8AID=E8=B5=8B=E5=80=BC=E9=94=99=E8=AF=AF=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将wechatChatroomId从contact.chatroomId改为contact.id以修复赋值错误
- 调整chatInitAPIdata中的初始化顺序，先获取群列表再处理唯一ID
- 修改getUniqueWechatAccountIds函数参数以支持群组数据
---
 Cunkebao/src/pages/pc/ckbox/main.ts        | 27 ++++++++++++++--------
 Cunkebao/src/store/module/weChat/weChat.ts |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Cunkebao/src/pages/pc/ckbox/main.ts b/Cunkebao/src/pages/pc/ckbox/main.ts
index ddf98dce..3a75ec00 100644
--- a/Cunkebao/src/pages/pc/ckbox/main.ts
+++ b/Cunkebao/src/pages/pc/ckbox/main.ts
@@ -17,7 +17,11 @@ import {
 
 import { useUserStore } from "@/store/module/user";
 
-import { KfUserListData } from "@/pages/pc/ckbox/data";
+import {
+  KfUserListData,
+  ContractData,
+  weChatGroup,
+} from "@/pages/pc/ckbox/data";
 
 import { WechatGroup } from "./api";
 const { login2 } = useUserStore.getState();
@@ -30,9 +34,16 @@ export const chatInitAPIdata = async () => {
     //获取联系人列表
     asyncContractList(contractList);
 
+    //获取群列表
+    const groupList = await getAllGroupList();
+
+    await asyncWeChatGroup(groupList);
+
     // 提取不重复的wechatAccountId组
-    const uniqueWechatAccountIds: number[] =
-      getUniqueWechatAccountIds(contractList);
+    const uniqueWechatAccountIds: number[] = getUniqueWechatAccountIds(
+      contractList,
+      groupList,
+    );
 
     //获取控制终端列表
     const kfUserList: KfUserListData[] =
@@ -41,11 +52,6 @@ export const chatInitAPIdata = async () => {
     //获取用户列表
     await asyncKfUserList(kfUserList);
 
-    //获取群列表
-    const groupList = await getAllGroupList();
-
-    await asyncWeChatGroup(groupList);
-
     //获取标签列表
     const countLables = await getCountLables();
     await asyncCountLables(countLables);
@@ -209,7 +215,10 @@ export const getAllContactList = async () => {
 };
 
 // 提取不重复的wechatAccountId组
-export const getUniqueWechatAccountIds = contacts => {
+export const getUniqueWechatAccountIds = (
+  contacts: ContractData[],
+  groupList: weChatGroup[],
+) => {
   if (!contacts || !Array.isArray(contacts) || contacts.length === 0) {
     return [];
   }
diff --git a/Cunkebao/src/store/module/weChat/weChat.ts b/Cunkebao/src/store/module/weChat/weChat.ts
index 696ba0bd..6025102c 100644
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -54,7 +54,7 @@ export const useWeChatStore = create<WeChatState>()(
           };
 
           if ("chatroomId" in contact && contact.chatroomId) {
-            params.wechatChatroomId = contact.chatroomId;
+            params.wechatChatroomId = contact.id;
           } else {
             params.wechatFriendId = contact.id;
           }