From a86ded9ea6257db8ff2014ac564e79707b3020ad Mon Sep 17 00:00:00 2001 From: wuzilong <704541015@qq.com> Date: Thu, 12 Nov 2026 19:45:51 +0800 Subject: [PATCH] fix(pl): include pending recharge applies in approval menu badge Co-authored-by: Cursor --- backend/app/services/pl_menu_badge_service.py | 2 +- backend/tests/test_pl_menu_badge_recharge_approval.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/app/services/pl_menu_badge_service.py b/backend/app/services/pl_menu_badge_service.py index db3f175e9..9d749ddc5 100644 --- a/backend/app/services/pl_menu_badge_service.py +++ b/backend/app/services/pl_menu_badge_service.py @@ -164,7 +164,7 @@ def count_recharge_approval_pending(db: Session, tenant_no: str, user_id: str) - .filter( PlVehicleRechargeApply.tenant_no == tenant_no, PlVehicleRechargeApply.del_flag == 0, - PlVehicleRechargeApply.status == "in_approval", + PlVehicleRechargeApply.status.in_(("in_approval", "pending")), BxWorkflowNode.tenant_no == tenant_no, BxWorkflowNode.del_flag == 0, BxWorkflowNode.approver_id == user_id, diff --git a/backend/tests/test_pl_menu_badge_recharge_approval.py b/backend/tests/test_pl_menu_badge_recharge_approval.py index f9d3e836e..f5ec7744e 100644 --- a/backend/tests/test_pl_menu_badge_recharge_approval.py +++ b/backend/tests/test_pl_menu_badge_recharge_approval.py @@ -75,6 +75,7 @@ def test_recharge_approval_badge_counts_current_approver_pending(monkeypatch): add_apply("a3", status="in_approval", current_node="node-other") add_apply("a4", status="rejected", current_node="node-me") add_apply("a5", status="draft", current_node=None) + add_apply("a6", status="pending", current_node="node-me") db.commit() monkeypatch.setattr( @@ -89,4 +90,4 @@ def test_recharge_approval_badge_counts_current_approver_pending(monkeypatch): user_id="u-me", menu_codes=[MENU_CODE_RECHARGE_APPROVAL], ) - assert counts[MENU_CODE_RECHARGE_APPROVAL] == 2 + assert counts[MENU_CODE_RECHARGE_APPROVAL] == 3