From 0862b664d9cfc41bbc91f445dc57c8c3cd4086a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Wed, 9 Nov 2022 16:45:01 +0800 Subject: [PATCH] changes --- AppUser/Router/UserAdminRouter.py | 12 ++++++++++++ AppUser/Schemas/UserSchemas.py | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/AppUser/Router/UserAdminRouter.py b/AppUser/Router/UserAdminRouter.py index 1b35340..a1ba407 100644 --- a/AppUser/Router/UserAdminRouter.py +++ b/AppUser/Router/UserAdminRouter.py @@ -73,6 +73,18 @@ def func03(uid: str, schema: UserSchemas.EditReqBody, db: Session = Depends(get_ if not data: raise HTTPException(status_code=202, detail="User Not found") + # 检查角色是否存在 + if schema.role_id: + role_obj = RoleCrud.get_role_by_id(db=db, role_id=schema.role_id) + if not role_obj: + raise HTTPException(status_code=202, detail="Role Not Existed") + + # 检查部门是否存在 + if schema.role_id: + department_obj = DepartmentCrud.get_department_by_id(db=db, department_id=schema.department_id) + if not department_obj: + raise HTTPException(status_code=202, detail="Department Not Existed") + # 编辑用户 result = UserCrud.edit_user(db=db, schema=schema, uid=uid) if not result: diff --git a/AppUser/Schemas/UserSchemas.py b/AppUser/Schemas/UserSchemas.py index 00b8030..18a7a40 100644 --- a/AppUser/Schemas/UserSchemas.py +++ b/AppUser/Schemas/UserSchemas.py @@ -16,7 +16,6 @@ class CreateReqBody(BaseModel): class FullUserResBody(BaseModel): - id: str email: EMailRegex = "xxxx@fecr.com.cn" name: str = "用户" @@ -35,7 +34,7 @@ class EditReqBody(BaseModel): def del_null_value(self): _dict = self.dict() for key in list(_dict.keys()): - if not _dict.get(key): + if _dict.get(key) is None: del _dict[key] return _dict