From d8ed1bfdd0acbf7cbce9982a4fdba331ff96d0aa Mon Sep 17 00:00:00 2001 From: zayac Date: Sun, 31 Mar 2024 13:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entity/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entity/user.py b/src/entity/user.py index 0a9ea23..9485d32 100644 --- a/src/entity/user.py +++ b/src/entity/user.py @@ -2,7 +2,7 @@ from dataclasses import dataclass from typing import List from cachetools import TTLCache, cached -from sqlalchemy import String, func +from sqlalchemy import String, func, and_ from sqlalchemy.dialects.mssql import TINYINT from sqlalchemy.orm import Mapped, mapped_column, relationship @@ -47,7 +47,7 @@ def get_all_users(): def get_user_by_telegram_id(telegram_id: int) -> User: with db.Session() as session: user = session.query(User).filter( - User.status == 1 and func.find_in_set(telegram_id, User.telegram_ids) > 0).one() + and_(User.status == 1,func.find_in_set(telegram_id, User.telegram_ids) > 0)).one() # 过滤出所有状态为可用的账户，并将它们存储在 User 对象中 user.accounts = [account for account in user.accounts if account.status == 1] user.accounts.sort(key=lambda account: account.type.value)