From 4a80b10d529488d82aa99f99086236928176a2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sun, 26 Jul 2026 08:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wizard/soong_workflow_comment_wizard.py | 5 ----- .../soong_workflow_record_delete_wizard.py | 22 +++++++++---------- yuthon_issue/models/issue_approval.py | 10 --------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 0a289bbe9..7e3171e7c 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -574,11 +574,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_btn_name == '退回': if not self.return_link_id: raise UserError('请选择退回节点') - if self.res_model == 'issue.approval': - if self.return_link_id.name == '申请人': - if record_id.issue_approval_ids: - for issue_library in record_id.issue_approval_ids: - issue_library.issue_library_id.issue_state = 'draft' record_id.write({'state': self.return_link_id.name}) next_node_id = record_id.workflow_id.node_ids.search([('name', '=', self.return_link_id.name), ('workflow_id', '=', record_id.workflow_id.id)]) for next_link in record_id.workflow_id.link_ids: diff --git a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py index a3bc1eacc..87123aa79 100644 --- a/soong_workflow/wizard/soong_workflow_record_delete_wizard.py +++ b/soong_workflow/wizard/soong_workflow_record_delete_wizard.py @@ -22,16 +22,16 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel): if not workflow_record: continue # 议题状态恢复 - if workflow_record.res_model == "issue.approval": - issue_id = self.env["issue.approval"].sudo().search([("id", "=", workflow_record.res_id)], limit=1) - issue_line_records = self.env['issue.approval.line'].search([ - ('issue_approval_id', '=', issue_id.id) - ]) - if issue_line_records: - issue_line_records.unlink() - issue_library_id = self.env["issue.library"].sudo().search([("issue_approval_id", "=", issue_id.id)], limit=1) - if issue_library_id: - issue_library_id.write({'issue_state': 'draft'}) + # if workflow_record.res_model == "issue.approval": + # issue_id = self.env["issue.approval"].sudo().search([("id", "=", workflow_record.res_id)], limit=1) + # issue_line_records = self.env['issue.approval.line'].search([ + # ('issue_approval_id', '=', issue_id.id) + # ]) + # if issue_line_records: + # issue_line_records.unlink() + # issue_library_id = self.env["issue.library"].sudo().search([("issue_approval_id", "=", issue_id.id)], limit=1) + # if issue_library_id: + # issue_library_id.write({'issue_state': 'draft'}) if workflow_record.res_model == "hr.leave.batch": log = self.env[f"{record.res_model}"].sudo().search([("id", "=", record.res_id)]) if log.leave_ids: @@ -80,7 +80,7 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel): # 处理工作流日志 log_ids = self.env["soong.workflow.log"].sudo().search([("res_id", "=", record.res_id), - ("model", "=", record.res_model), + ("res_model", "=", record.res_model), ]) for log_id in log_ids: log_id.sudo().write({"active": False}) diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index e5aab350b..220784d63 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -186,16 +186,6 @@ class IssueApprovalLine(models.Model): is_boss = fields.Boolean(related='issue_library_id.is_boss', string="董事会") is_note = fields.Boolean(related='issue_library_id.is_note', string="上级单位") - def unlink(self): - delete_lines = self.filtered(lambda l: l.issue_library_id.exists()) - issue_library_records = self.env['issue.library'] - for line in delete_lines: - issue_library_records |= line.issue_library_id - if issue_library_records: - issue_library_records.write({'issue_state': 'draft'}) - issue_library_records.issue_approval_id = False - return super(IssueApprovalLine, self).unlink() - def open_record(self): self.ensure_one() is_modify = False