|
|
@ -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 方法 |
|
|
|