From a7e25a313e0a6938b753bbd77720defbce5190e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Tue, 1 Nov 2022 16:22:28 +0800 Subject: [PATCH] changes --- User/crud.py | 4 +--- User/schemas.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/User/crud.py b/User/crud.py index f76cd47..2d339eb 100644 --- a/User/crud.py +++ b/User/crud.py @@ -36,12 +36,10 @@ def get_user_by_email(db: Session, email: str): def get_users(db: Session, body: schemas.UserSearch, skip, limit): return db.query(models.User).filter( - or_(models.User.id == body.id, body.id is None), or_(models.User.email.like("%" + "" if body.email is None else body.email + "%"), body.email is None), or_(models.User.name.like("%" + "" if body.name is None else body.name + "%"), body.name is None), or_(models.User.role == body.role, body.role is None), - or_(models.User.depart == body.depart, body.depart is None), - or_(models.User.is_active == body.is_active, body.is_active is None), + or_(models.User.depart == body.depart, body.depart is None) ).offset(skip).limit(limit).all() diff --git a/User/schemas.py b/User/schemas.py index 9750d3c..22c1252 100644 --- a/User/schemas.py +++ b/User/schemas.py @@ -64,17 +64,15 @@ class UserLogin(BaseModel): class UserSearch(BaseModel): - id: Optional[int] = None email: Optional[str] = None name: Optional[str] = None role: Optional[str] = None depart: Optional[str] = None - is_active: Optional[bool] = None class User(UserBase): - id: int + id: str is_active: bool class Config: