This commit is contained in:
fengchuanhn@gmail.com
2026-05-22 15:01:48 +08:00
parent 5aafba8eb9
commit 6f67bf703b
2 changed files with 7 additions and 0 deletions

View File

@@ -19,6 +19,7 @@ class AdminUserError(Exception):
def _list_users_filters(
*,
username: str | None = None,
device_serial: str | None = None,
oem_id: int | None = None,
agent_id: int | None = None,
role_id: int | None = None,
@@ -26,6 +27,8 @@ def _list_users_filters(
conditions = []
if username and username.strip():
conditions.append(User.username.ilike(f"%{username.strip()}%"))
if device_serial and device_serial.strip():
conditions.append(User.device_serial.ilike(f"%{device_serial.strip()}%"))
if oem_id is not None:
conditions.append(User.oem_id == oem_id)
if agent_id is not None:
@@ -41,6 +44,7 @@ async def list_users(
page: int = 1,
page_size: int = DEFAULT_PAGE_SIZE,
username: str | None = None,
device_serial: str | None = None,
oem_id: int | None = None,
agent_id: int | None = None,
role_id: int | None = None,
@@ -50,6 +54,7 @@ async def list_users(
offset = (page - 1) * page_size
conditions = _list_users_filters(
username=username,
device_serial=device_serial,
oem_id=oem_id,
agent_id=agent_id,
role_id=role_id,