From b2760cde0e964140206632e2c94f2d3e8291a612 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Thu, 11 Dec 2025 17:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E3=80=81=E5=A5=BD=E5=8F=8B=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AE=A2=E6=9C=8D=E5=BE=AE=E4=BF=A1=E5=8F=B7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chukebao/controller/WechatChatroomController.php       | 7 ++++++-
 .../chukebao/controller/WechatFriendController.php         | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Server/application/chukebao/controller/WechatChatroomController.php b/Server/application/chukebao/controller/WechatChatroomController.php
index 9c33baed2..5d521143c 100644
--- a/Server/application/chukebao/controller/WechatChatroomController.php
+++ b/Server/application/chukebao/controller/WechatChatroomController.php
@@ -15,7 +15,8 @@ class WechatChatroomController extends BaseController
         $page = $this->request->param('page', 1);
         $limit =  $this->request->param('limit', 10);
         $keyword = $this->request->param('keyword', '');
-        $groupIds = $this->request->param('groupIds', '');
+        $groupIds = $this->request->param('groupId', '');
+        $ownerWechatId = $this->request->param('ownerWechatId', '');
         $accountId = $this->getUserInfo('s2_accountId');
         if (empty($accountId)){
             return ResponseHelper::error('请先登录');
@@ -37,6 +38,10 @@ class WechatChatroomController extends BaseController
             $query->where('groupIds', $groupIds);
         }
 
+        if (!empty($ownerWechatId)) {
+            $query->where('ownerWechatId', $ownerWechatId);
+        }
+
         $query->order('id desc');
         $total = $query->count();
         $list = $query->page($page, $limit)->select();
diff --git a/Server/application/chukebao/controller/WechatFriendController.php b/Server/application/chukebao/controller/WechatFriendController.php
index da4782c25..aaf541f11 100644
--- a/Server/application/chukebao/controller/WechatFriendController.php
+++ b/Server/application/chukebao/controller/WechatFriendController.php
@@ -14,7 +14,8 @@ class WechatFriendController extends BaseController
         $page = $this->request->param('page', 1);
         $limit = $this->request->param('limit', 10);
         $keyword = $this->request->param('keyword', '');
-        $groupIds = $this->request->param('groupIds', '');
+        $groupIds = $this->request->param('groupId', '');
+        $ownerWechatId = $this->request->param('ownerWechatId', '');
         $accountId = $this->getUserInfo('s2_accountId');
         if (empty($accountId)) {
             return ResponseHelper::error('请先登录');
@@ -38,6 +39,10 @@ class WechatFriendController extends BaseController
             $query->where('groupIds', $groupIds);
         }
 
+        if (!empty($ownerWechatId)) {
+            $query->where('ownerWechatId', $ownerWechatId);
+        }
+
         $query->order('id desc');
         $total = $query->count();
         $list = $query->page($page, $limit)->select();