From 78c06adaf823cc5715a3f52ae6ea3a9bfc3d766c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sat, 3 Jan 2026 10:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Guild.php |  3 ++-
 application/api/model/Guild.php      | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php
index 12f9f56e..bc014e45 100644
--- a/application/api/controller/Guild.php
+++ b/application/api/controller/Guild.php
@@ -192,7 +192,8 @@ class Guild extends BaseCom
         $guild_id = input('guild_id', 0);
         $page = input('page', 1);
         $page_limit = input('page_limit', 20);
-        $reslut = model('Guild')->get_guild_user_list($guild_id,$uid,$page,$page_limit);
+        $seach = input('search', '');
+        $reslut = model('Guild')->get_guild_user_list($guild_id,$uid,$page,$page_limit,$seach);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
 
     }
diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index b021c376..217f31a3 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -904,20 +904,30 @@ class Guild extends Model
     /*
     * 获取公会成员列表
     */
-    public function get_guild_user_list($guild_ids,$user_id,$page=1,$page_limit=30){
+    public function get_guild_user_list($guild_ids,$user_id,$page=1,$page_limit=30,$seach=""){
         //获取$guild_id的第一个字母
         $guild_id_first_letter = substr($guild_ids, 0, 1);
         $guild_id = substr($guild_ids, 1);
+        $seach_where = [];
+        if($seach){
+            if(is_numeric($seach)){
+                $seach_where = ['b.user_code' => ['like', $seach . '%']];
+            }else{
+                $seach_where = ['b.nickname' => ['like', '%' . $seach . '%']];
+            }
+        }
         if($guild_id_first_letter == 'g'){
             $count = Db::name('vs_guild_user')
                 ->alias('a')
                 ->join('user b','a.user_id = b.id')
+                ->where($seach_where)
                 ->where(['a.guild_id'=>$guild_id,'a.status'=>1,'a.delete_time'=>0])
                 ->count();
             $list = Db::name('vs_guild_user')
                 ->alias('a')
                 ->join('user b', 'a.user_id = b.id')
                 ->field('a.id, a.user_id, a.guild_id, b.nickname, b.avatar, b.user_code, a.createtime')
+                ->where($seach_where)
                 ->where(['a.guild_id' => $guild_id, 'a.status' => 1,'a.delete_time' => 0])
                 ->order('a.id asc')
                 ->page($page, $page_limit)
@@ -927,6 +937,7 @@ class Guild extends Model
             $list = db::name('vs_family')->alias('a')
                 ->join('user b','a.user_id = b.id')
                 ->field('b.is_online,b.market_value,b.nickname,b.avatar,b.user_code,a.user_id,a.createtime')
+                ->where($seach_where)
                 ->where(['a.pid' => $myFamilyPid,'a.deletetime' => 0,'a.type' => 0])
                 ->order('a.id asc')
                 ->page($page, $page_limit)
@@ -934,6 +945,7 @@ class Guild extends Model
 
             $count = db::name('vs_family')->alias('a')
                 ->join('user b','a.user_id = b.id')
+                ->where($seach_where)
                 ->where(['a.pid' => $myFamilyPid,'a.deletetime' => 0,'a.type' => 0])
                 ->count();
         }