From 6734df119abd6614f85a2684e274bf43ebd091e5 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Tue, 16 Jul 2024 15:15:43 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/controller/user_controller.py | 2 +- ruoyi-fastapi-backend/module_admin/dao/user_dao.py | 4 ++-- .../module_admin/service/user_service.py | 12 +++--------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py index bad051d..253535c 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py @@ -303,7 +303,7 @@ async def reset_system_user_password( reset_user = ResetUserModel( userId=current_user.user.user_id, oldPassword=reset_password.old_password, - password=PwdUtil.get_password_hash(reset_password.new_password), + password=reset_password.new_password, updateBy=current_user.user.user_name, updateTime=datetime.now(), ) diff --git a/ruoyi-fastapi-backend/module_admin/dao/user_dao.py b/ruoyi-fastapi-backend/module_admin/dao/user_dao.py index e32656c..52a088c 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/user_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/user_dao.py @@ -449,7 +449,7 @@ class UserDao: SysUser.del_flag == '0', SysUser.user_name == query_object.user_name if query_object.user_name else True, SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True, - or_(SysRole.role_id != query_object.role_id, SysRole.role_id is None), + or_(SysRole.role_id != query_object.role_id, SysRole.role_id.is_(None)), ~SysUser.user_id.in_( select(SysUser.user_id) .select_from(SysUser) @@ -502,7 +502,7 @@ class UserDao: """ await db.execute( delete(SysUserRole).where( - SysUserRole.user_id.in_([user_role.user_id]), + SysUserRole.user_id == user_role.user_id if user_role.user_id else True, SysUserRole.role_id == user_role.role_id if user_role.role_id else True, ) ) diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py index 8009b98..dc79430 100644 --- a/ruoyi-fastapi-backend/module_admin/service/user_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py @@ -333,6 +333,7 @@ class UserService: del reset_user['sms_code'] del reset_user['session_id'] try: + reset_user['password'] = PwdUtil.get_password_hash(page_object.password) await UserDao.edit_user_dao(query_db, reset_user) await query_db.commit() return CrudResponseModel(is_success=True, message='重置成功') @@ -553,16 +554,9 @@ class UserService: if page_object.user_id and page_object.role_ids: role_id_list = page_object.role_ids.split(',') try: + await UserDao.delete_user_role_by_user_and_role_dao(query_db, UserRoleModel(userId=page_object.user_id)) for role_id in role_id_list: - user_role = await cls.detail_user_role_services( - query_db, UserRoleModel(userId=page_object.user_id, roleId=role_id) - ) - if user_role: - continue - else: - await UserDao.add_user_role_dao( - query_db, UserRoleModel(userId=page_object.user_id, roleId=role_id) - ) + await UserDao.add_user_role_dao(query_db, UserRoleModel(userId=page_object.user_id, roleId=role_id)) await query_db.commit() return CrudResponseModel(is_success=True, message='分配成功') except Exception as e: