changes

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:

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