diff --git a/src/admin/users/index.tsx b/src/admin/users/index.tsx
index 58ac8ab..bc5abde 100644
--- a/src/admin/users/index.tsx
+++ b/src/admin/users/index.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useRef, useState} from 'react'
+import {useRef, useState} from 'react'
 import Taro, {useDidShow} from '@tarojs/taro'
 import {View, Text} from '@tarojs/components'
 import {
@@ -14,6 +14,7 @@ import {
 import type {User} from '@/api/system/user/model'
 import {pageUsers} from '@/api/system/user'
 import {listUserRole, updateUserRole} from '@/api/system/userRole'
+import {listRoles} from '@/api/system/role'
 
 const PAGE_SIZE = 10
 
@@ -26,7 +27,21 @@ const AdminUsers = () => {
   const [page, setPage] = useState(1)
   const [total, setTotal] = useState(0)
 
-  const rolesLoadedRef = useRef(false)
+  const roleIdMapRef = useRef<Record<string, number>>({})
+  const roleMapLoadedRef = useRef(false)
+
+  const getRoleIdByCode = async (roleCode: string) => {
+    if (!roleMapLoadedRef.current) {
+      const roles = await listRoles()
+      const nextMap: Record<string, number> = {}
+      roles?.forEach(role => {
+        if (role.roleCode && role.roleId) nextMap[role.roleCode] = role.roleId
+      })
+      roleIdMapRef.current = nextMap
+      roleMapLoadedRef.current = true
+    }
+    return roleIdMapRef.current[roleCode]
+  }
 
   const reload = async (isRefresh = false, overrideKeywords?: string) => {
     if (loading) return
@@ -92,7 +107,8 @@ const AdminUsers = () => {
 
   const toggleRole = async (target: User) => {
     const current = getPrimaryRoleCode(target)
-    const nextRoleName = current === 'dealer' ? '注册会员' : '业务员'
+    const nextRoleCode = current === 'dealer' ? 'user' : 'dealer'
+    const nextRoleName = nextRoleCode === 'user' ? '注册会员' : '业务员'
 
     const confirmRes = await Taro.showModal({
       title: '确认切换角色',
@@ -104,18 +120,23 @@ const AdminUsers = () => {
       const userId = target.userId
       if (!userId) return
 
+      const nextRoleId = await getRoleIdByCode(nextRoleCode)
+      if (!nextRoleId) {
+        throw new Error(`未找到角色配置：${nextRoleCode}`)
+      }
+
       const roles = await listUserRole({userId})
-      const candidate = roles?.find(r => r.roleCode === 'dealer' || r.roleCode === 'user') || roles?.[0]
+      const candidate = roles?.find(r => r.roleCode === 'dealer' || r.roleCode === 'user')
 
       if (candidate) {
         await updateUserRole({
           ...candidate,
-          roleId: 1935
+          roleId: nextRoleId
         })
       } else {
         await updateUserRole({
           userId,
-          roleId: 1915
+          roleId: nextRoleId
         })
       }
 
@@ -129,7 +150,7 @@ const AdminUsers = () => {
 
   const handleSearch = (value: string) => {
     setSearchValue(value)
-    reload(true, undefined).then()
+    reload(true, value).then()
   }
 
   const loadMore = async () => {
@@ -150,12 +171,6 @@ const AdminUsers = () => {
     init().then()
   })
 
-  useEffect(() => {
-    if (!rolesLoadedRef.current) return
-    reload(true).then()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchValue])
-
   return (
     <View className="bg-gray-50 min-h-screen">