From dd06b1bf31c755813eb46effeced911216526c57 Mon Sep 17 00:00:00 2001 From: siyaqi Date: Mon, 28 Apr 2025 11:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-fastapi-backend/module_admin/dao/approval_dao.py | 6 +++--- .../module_admin/service/approval_service.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vue-fastapi-backend/module_admin/dao/approval_dao.py b/vue-fastapi-backend/module_admin/dao/approval_dao.py index 615f5ff..2bb088d 100644 --- a/vue-fastapi-backend/module_admin/dao/approval_dao.py +++ b/vue-fastapi-backend/module_admin/dao/approval_dao.py @@ -45,7 +45,7 @@ class ApprovalDao: (FlowApproval.businessType == query_param.businessType) if query_param.businessType else True, or_(*[FlowApproval.nextStepRole.like(f'%{role}%') for role in roleList], FlowApproval.nextStepUser.like(f'%{current_user.user.user_name}%')), - ).order_by(FlowApproval.applyTime) + ).order_by(FlowApproval.applyTime.desc()) .distinct()) # 注意：这里不执行查询，而是将查询对象传递给 paginate 方法 result = await PageUtil.paginate(db, query, query_param.page_num, query_param.page_size, True) @@ -61,7 +61,7 @@ class ApprovalDao: (FlowApproval.businessType == query_param.businessType) if query_param.businessType else True, FlowApproval.approvalFlow.like(f'%{current_user.user.user_name}%') ) - .order_by(FlowApproval.applyTime) + .order_by(FlowApproval.applyTime.desc()) .distinct() ) # 注意：这里不执行查询，而是将查询对象传递给 paginate 方法 @@ -77,7 +77,7 @@ class ApprovalDao: FlowApproval.applicant == current_user.user.user_name, (FlowApproval.businessType == query_param.businessType) if query_param.businessType else True, ) - .order_by(FlowApproval.applyTime) + .order_by(FlowApproval.applyTime.desc()) .distinct() ) # 注意：这里不执行查询，而是将查询对象传递给 paginate 方法 diff --git a/vue-fastapi-backend/module_admin/service/approval_service.py b/vue-fastapi-backend/module_admin/service/approval_service.py index f07e9ad..8804b15 100644 --- a/vue-fastapi-backend/module_admin/service/approval_service.py +++ b/vue-fastapi-backend/module_admin/service/approval_service.py @@ -212,7 +212,7 @@ class ApprovalService: await DataStdDao.add_std_code(result_db, main_model) - elif change_type == "edit": + elif change_type == "update": # 使用 oldInstId 作为主键 main_model = DataStdCodeModel(**appr_model.model_dump(exclude_unset=True, by_alias=True))