DigitalMgnt
/
user-wsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

This commit is contained in:
王思川 2022-11-01 16:22:28 +08:00
parent 39650d2faa
commit a7e25a313e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
User/crud.py
View File

@ -36,12 +36,10 @@ def get_user_by_email(db: Session, email: str):
def get_users(db: Session, body: schemas.UserSearch, skip, limit): def get_users(db: Session, body: schemas.UserSearch, skip, limit):
return db.query(models.User).filter( 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.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.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.role == body.role, body.role is None),
or_(models.User.depart == body.depart, body.depart 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),
).offset(skip).limit(limit).all() ).offset(skip).limit(limit).all()

4
User/schemas.py
View File

@ -64,17 +64,15 @@ class UserLogin(BaseModel):
class UserSearch(BaseModel): class UserSearch(BaseModel):
id: Optional[int] = None
email: Optional[str] = None email: Optional[str] = None
name: Optional[str] = None name: Optional[str] = None
role: Optional[str] = None role: Optional[str] = None
depart: Optional[str] = None depart: Optional[str] = None
is_active: Optional[bool] = None
class User(UserBase): class User(UserBase):
id: int id: str
is_active: bool is_active: bool
class Config: class Config: