From d08fe67ab84e9c7f39615e8862cb83d8dd620b9a Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Wed, 26 Jun 2024 21:05:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=97=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E8=AE=B0=E5=BD=95=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/controller/config_controller.py | 2 ++ .../module_admin/controller/dept_controller.py | 2 ++ .../module_admin/controller/dict_controller.py | 4 ++++ .../module_admin/controller/job_controller.py | 2 ++ .../module_admin/controller/menu_controller.py | 2 ++ .../module_admin/controller/notice_controller.py | 2 ++ .../module_admin/controller/post_controler.py | 2 ++ .../module_admin/controller/role_controller.py | 2 ++ .../module_admin/controller/user_controller.py | 2 ++ ruoyi-fastapi-backend/module_admin/service/user_service.py | 7 +++++-- 10 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py index 576d62c..bc442d0 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/config_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/config_controller.py @@ -31,7 +31,9 @@ async def get_system_config_list(request: Request, config_page_query: ConfigPage async def add_system_config(request: Request, add_config: ConfigModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_config.create_by = current_user.user.user_name + add_config.create_time = datetime.now() add_config.update_by = current_user.user.user_name + add_config.update_time = datetime.now() add_config_result = await ConfigService.add_config_services(request, query_db, add_config) if add_config_result.is_success: logger.info(add_config_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py b/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py index 741dd7e..476ca3a 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/dept_controller.py @@ -41,7 +41,9 @@ async def get_system_dept_list(request: Request, dept_query: DeptQueryModel = De async def add_system_dept(request: Request, add_dept: DeptModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_dept.create_by = current_user.user.user_name + add_dept.create_time = datetime.now() add_dept.update_by = current_user.user.user_name + add_dept.update_time = datetime.now() add_dept_result = await DeptService.add_dept_services(query_db, add_dept) if add_dept_result.is_success: logger.info(add_dept_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py b/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py index fcf96eb..a686ef8 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/dict_controller.py @@ -31,7 +31,9 @@ async def get_system_dict_type_list(request: Request, dict_type_page_query: Dict async def add_system_dict_type(request: Request, add_dict_type: DictTypeModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_dict_type.create_by = current_user.user.user_name + add_dict_type.create_time = datetime.now() add_dict_type.update_by = current_user.user.user_name + add_dict_type.update_time = datetime.now() add_dict_type_result = await DictTypeService.add_dict_type_services(request, query_db, add_dict_type) if add_dict_type_result.is_success: logger.info(add_dict_type_result.message) @@ -160,7 +162,9 @@ async def get_system_dict_data_list(request: Request, dict_data_page_query: Dict async def add_system_dict_data(request: Request, add_dict_data: DictDataModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_dict_data.create_by = current_user.user.user_name + add_dict_data.create_time = datetime.now() add_dict_data.update_by = current_user.user.user_name + add_dict_data.update_time = datetime.now() add_dict_data_result = await DictDataService.add_dict_data_services(request, query_db, add_dict_data) if add_dict_data_result.is_success: logger.info(add_dict_data_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/job_controller.py b/ruoyi-fastapi-backend/module_admin/controller/job_controller.py index 2204722..04cc6e0 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/job_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/job_controller.py @@ -32,7 +32,9 @@ async def get_system_job_list(request: Request, job_page_query: JobPageQueryMode async def add_system_job(request: Request, add_job: JobModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_job.create_by = current_user.user.user_name + add_job.create_time = datetime.now() add_job.update_by = current_user.user.user_name + add_job.update_time = datetime.now() add_job_result = await JobService.add_job_services(query_db, add_job) if add_job_result.is_success: logger.info(add_job_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py b/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py index 49d1db0..949fd1a 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/menu_controller.py @@ -50,7 +50,9 @@ async def get_system_menu_list(request: Request, menu_query: MenuQueryModel = De async def add_system_menu(request: Request, add_menu: MenuModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_menu.create_by = current_user.user.user_name + add_menu.create_time = datetime.now() add_menu.update_by = current_user.user.user_name + add_menu.update_time = datetime.now() add_menu_result = await MenuService.add_menu_services(query_db, add_menu) if add_menu_result.is_success: logger.info(add_menu_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py b/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py index 1525727..0e2c0d7 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/notice_controller.py @@ -30,7 +30,9 @@ async def get_system_notice_list(request: Request, notice_page_query: NoticePage async def add_system_notice(request: Request, add_notice: NoticeModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_notice.create_by = current_user.user.user_name + add_notice.create_time = datetime.now() add_notice.update_by = current_user.user.user_name + add_notice.update_time = datetime.now() add_notice_result = await NoticeService.add_notice_services(query_db, add_notice) if add_notice_result.is_success: logger.info(add_notice_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/post_controler.py b/ruoyi-fastapi-backend/module_admin/controller/post_controler.py index 046ec63..2128a68 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/post_controler.py +++ b/ruoyi-fastapi-backend/module_admin/controller/post_controler.py @@ -32,7 +32,9 @@ async def get_system_post_list(request: Request, post_page_query: PostPageQueryM async def add_system_post(request: Request, add_post: PostModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_post.create_by = current_user.user.user_name + add_post.create_time = datetime.now() add_post.update_by = current_user.user.user_name + add_post.update_time = datetime.now() add_post_result = await PostService.add_post_services(query_db, add_post) if add_post_result.is_success: logger.info(add_post_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/role_controller.py b/ruoyi-fastapi-backend/module_admin/controller/role_controller.py index 6b848c9..068d94f 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/role_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/role_controller.py @@ -46,7 +46,9 @@ async def get_system_role_list(request: Request, role_page_query: RolePageQueryM async def add_system_role(request: Request, add_role: AddRoleModel, query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user)): try: add_role.create_by = current_user.user.user_name + add_role.create_time = datetime.now() add_role.update_by = current_user.user.user_name + add_role.update_time = datetime.now() add_role_result = await RoleService.add_role_services(query_db, add_role) if add_role_result.is_success: logger.info(add_role_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py index fc9f884..93c13ca 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/user_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/user_controller.py @@ -47,7 +47,9 @@ async def add_system_user(request: Request, add_user: AddUserModel, query_db: As try: add_user.password = PwdUtil.get_password_hash(add_user.password) add_user.create_by = current_user.user.user_name + add_user.create_time = datetime.now() add_user.update_by = current_user.user.user_name + add_user.update_time = datetime.now() add_user_result = await UserService.add_user_services(query_db, add_user) if add_user_result.is_success: logger.info(add_user_result.message) diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py index 40ff531..d1132de 100644 --- a/ruoyi-fastapi-backend/module_admin/service/user_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py @@ -275,7 +275,9 @@ class UserService: sex=row['sex'], status=row['status'], createBy=current_user.user.user_name, - updateBy=current_user.user.user_name + createTime=datetime.now(), + updateBy=current_user.user.user_name, + updateTime=datetime.now() ) user_info = await UserDao.get_user_by_info(query_db, UserModel(userName=row['user_name'])) if user_info: @@ -289,7 +291,8 @@ class UserService: phonenumber=str(row['phonenumber']), sex=row['sex'], status=row['status'], - updateBy=current_user.user.user_name + updateBy=current_user.user.user_name, + updateTime=datetime.now() ).model_dump(exclude_unset=True) await UserDao.edit_user_dao(query_db, edit_user) else: