From 80ce8552248880537c9d30571c5037b7179b7853 Mon Sep 17 00:00:00 2001
From: Hankin <hankin_h@126.com>
Date: Fri, 13 Mar 2026 11:23:49 +0800
Subject: [PATCH] test

---
 app/Http/Controllers/Admin/UserController.php | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index fa3b362..f86f3da 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -46,41 +46,43 @@ class UserController extends Controller
             $keyword = trim($keyword);
             $users = $users->where(function ($sql) use ($keyword) {
                 $sql->where('name', 'like', '%' . $keyword . '%')
-                    ->orWhere('mobile', 'like', '%' . $keyword . '%')->orWhere('mobile', aesEncryptCBC($keyword));
+                    ->orWhere("id", "like", "%$keyword%")
+                    ->orWhere('mobile', 'like', '%' . $keyword . '%')
+                    ->orWhere('mobile', aesEncryptCBC($keyword));
             });
         }
-        // $source = $request->input("source");
-        // $users = $users->when($source, function ($query) use ($source) {
-        //     $query->where('source', $source);
-        // });
+        $source = $request->input("source");
+        $users = $users->when($source, function ($query) use ($source) {
+            $query->where('source', $source);
+        });
 
         $platform = $request->input("platform");
         $users = $users->when($platform, function ($query) use ($platform) {
             $query->where('platform', "like", "%$platform%");
         });
-        $source = $request->input("source");
-        if (!empty($source)) {
-            $source = json_decode($source, true);
-        } else {
-            $source = [1, 4];
-        }
+        // $source = $request->input("source");
+        // if (!empty($source)) {
+        //     $source = json_decode($source, true);
+        // } else {
+        //     $source = [1, 4];
+        // }
 
-        $type = $request->input('type');
-        if ($type) {
-            if ($type == "H5") {
-                $users = $users->whereHas("officialWechat");
-            } elseif ($type == 'MP') {
-                $source = [1, 4];
-                $users = $users->where(function ($sql) use ($source) {
-                    $sql->whereIn('source', $source);
-                });
-            } elseif ($type == 'WORK') {
-                $source = [3];
-                $users = $users->where(function ($sql) use ($source) {
-                    $sql->whereIn('source', $source);
-                });
-            }
-        }
+        // $type = $request->input('type');
+        // if ($type) {
+        //     if ($type == "H5") {
+        //         $users = $users->whereHas("officialWechat");
+        //     } elseif ($type == 'MP') {
+        //         $source = [1, 4];
+        //         $users = $users->where(function ($sql) use ($source) {
+        //             $sql->whereIn('source', $source);
+        //         });
+        //     } elseif ($type == 'WORK') {
+        //         $source = [3];
+        //         $users = $users->where(function ($sql) use ($source) {
+        //             $sql->whereIn('source', $source);
+        //         });
+        //     }
+        // }
 
 
         $nopage = $request->input("nopage");