From 069e786696dc1721c048656371334323ca0ef70b Mon Sep 17 00:00:00 2001
From: Hankin <hankin_h@126.com>
Date: Fri, 21 Aug 2026 15:38:37 +0800
Subject: [PATCH] user list

---
 app/Http/Controllers/Server/H5/MakeFriendsController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Http/Controllers/Server/H5/MakeFriendsController.php b/app/Http/Controllers/Server/H5/MakeFriendsController.php
index 01d864b..cd83340 100644
--- a/app/Http/Controllers/Server/H5/MakeFriendsController.php
+++ b/app/Http/Controllers/Server/H5/MakeFriendsController.php
@@ -415,6 +415,7 @@ class MakeFriendsController extends Controller
     {
         try {
             $m_id = $request->merchant_id;
+            $keyword = $request->input('keyword'); // 获取搜索关键词
 
             // 1. 获取所有关联的商户用户 ID（仍需要一次查询）
             $ids = IdentityAuthorization::where('m_id', $m_id)
@@ -427,6 +428,10 @@ class MakeFriendsController extends Controller
 
             // 2. 批量加载用户、profile 和 photos（仅一次查询，附带 m_id 条件）
             $usersWithData = MerchantUsers::whereIn('id', $ids)
+                ->when($keyword, function ($query, $keyword) {
+                    // 搜索 nickname，支持模糊匹配
+                    return $query->where('nickname', 'like', '%' . $keyword . '%');
+                })
                 ->with([
                     'profile' => function ($q) use ($m_id) {
                         $q->where('m_id', $m_id);