diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index 7069facaa..6d164f9ef 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -15,7 +15,7 @@ - + @@ -23,8 +23,8 @@ - - + + diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index c26c2400a..d34ec9359 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -181,10 +181,16 @@ class SoongWorkflowCommentWizard(models.TransientModel): ('name', '=', link.name), ('workflow_id', '=', workflow_id.id) ]) - if node.button_ids[0].name != '转交': - button = node.button_ids[-1] if node.button_ids else False + if node.button_ids: + # 优先找“转交”按钮 + transfer_btn = next((btn for btn in node.button_ids if btn.name == '转交'), None) + if transfer_btn: + button = transfer_btn + else: + # 找不到“转交”再找“结束” + button = next((btn for btn in node.button_ids if btn.name == '结束'), None) else: - button = node.button_ids[0] if node.button_ids else False + button = False if not button: return self.env['hr.employee']