diff --git a/Cunkebao/src/pages/pc/ckbox/api.ts b/Cunkebao/src/pages/pc/ckbox/api.ts
index 3ea80e5b..1d27fdb0 100644
--- a/Cunkebao/src/pages/pc/ckbox/api.ts
+++ b/Cunkebao/src/pages/pc/ckbox/api.ts
@@ -25,7 +25,8 @@ export function clearUnreadCount(params) {
 //获取聊天记录-2 获取列表
 export function getMessages(params: {
   wechatAccountId: number;
-  wechatFriendId: number;
+  wechatFriendId?: number;
+  wechatChatroomId?: number;
   From: number;
   To: number;
   Count: number;
diff --git a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
index 546d5b4e..cdb1ca41 100644
--- a/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/components/ChatWindow/index.tsx
@@ -35,7 +35,7 @@ import {
   TeamOutlined,
   StarOutlined,
 } from "@ant-design/icons";
-import { ChatRecord, ContractData } from "@/pages/pc/ckbox/data";
+import { ChatRecord, ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
 import { clearUnreadCount, getMessages } from "@/pages/pc/ckbox/api";
 import styles from "./ChatWindow.module.scss";
 import { useWebSocketStore, WebSocketMessage } from "@/store/module/websocket";
@@ -46,7 +46,7 @@ const { Header, Content, Footer } = Layout;
 const { TextArea } = Input;
 
 interface ChatWindowProps {
-  contract: ContractData;
+  contract: ContractData | weChatGroup;
   onSendMessage: (message: string) => void;
   showProfile?: boolean;
   onToggleProfile?: () => void;
@@ -72,14 +72,19 @@ const ChatWindow: React.FC<ChatWindowProps> = ({
   useEffect(() => {
     clearUnreadCount([contract.id]).then(() => {
       setLoading(true);
-      getMessages({
+      const params: any = {
         wechatAccountId: contract.wechatAccountId,
-        wechatFriendId: contract.id,
         From: 1,
         To: +new Date() + 1000,
         Count: 100,
         olderData: true,
-      })
+      };
+      if (contract.groupId == 1) {
+        params.wechatFriendId = contract.id;
+      } else {
+        params.wechatChatroomId = contract.id;
+      }
+      getMessages(params)
         .then(msg => {
           setMessages(msg);
         })