From 6ea8ada989cfb5fdd00bdf58e489525a79346ed8 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Sat, 11 May 2024 21:15:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=90=8E=E7=AB=AF=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user_controller.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py index a991556..9385a6d 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py @@ -198,11 +198,20 @@ async def change_system_user_profile_avatar(request: Request, avatarfile: bytes @log_decorator(title='个人信息', business_type=2) async def change_system_user_profile_info(request: Request, user_info: UserInfoModel, query_db: Session = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: - edit_user = EditUserModel(**user_info.model_dump(by_alias=True, exclude={'role_ids', 'post_ids'}), roleIds=user_info.role_ids.split(','), postIds=user_info.post_ids.split(',')) - edit_user.user_id = current_user.user.user_id - edit_user.update_by = current_user.user.user_name - edit_user.update_time = datetime.now() - print(edit_user.model_dump()) + edit_user = EditUserModel( + **user_info.model_dump( + exclude_unset=True, + by_alias=True, + exclude={'role_ids', 'post_ids'} + ), + userId=current_user.user.user_id, + userName=current_user.user.user_name, + updateBy=current_user.user.user_name, + updateTime=datetime.now(), + roleIds=current_user.user.role_ids.split(',') if current_user.user.role_ids else [], + postIds=current_user.user.post_ids.split(',') if current_user.user.post_ids else [], + role=current_user.user.role + ) edit_user_result = UserService.edit_user_services(query_db, edit_user) if edit_user_result.is_success: logger.info(edit_user_result.message)