diff --git a/routes/bot_manager.py b/routes/bot_manager.py
index cc69bfc..c069bca 100644
--- a/routes/bot_manager.py
+++ b/routes/bot_manager.py
@@ -2257,15 +2257,26 @@ async def search_users(
 
     async with pool.connection() as conn:
         async with conn.cursor() as cursor:
-            await cursor.execute("""
-                SELECT id, username, email
-                FROM agent_user
-                WHERE is_active = TRUE
-                AND (username ILIKE %s OR email ILIKE %s)
-                AND id != %s
-                ORDER BY username
-                LIMIT 20
-            """, (f"%{q}%", f"%{q}%", user_id))
+            # 动态构建查询：如果有 user_id 则排除当前用户
+            if user_id:
+                await cursor.execute("""
+                    SELECT id, username, email
+                    FROM agent_user
+                    WHERE is_active = TRUE
+                    AND (username ILIKE %s OR email ILIKE %s)
+                    AND id != %s
+                    ORDER BY username
+                    LIMIT 20
+                """, (f"%{q}%", f"%{q}%", user_id))
+            else:
+                await cursor.execute("""
+                    SELECT id, username, email
+                    FROM agent_user
+                    WHERE is_active = TRUE
+                    AND (username ILIKE %s OR email ILIKE %s)
+                    ORDER BY username
+                    LIMIT 20
+                """, (f"%{q}%", f"%{q}%"))
             rows = await cursor.fetchall()
 
             return [