From 943c2af652b64e2091f6cb5c3b5d93b9afec2b28 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: Thu, 8 Jan 2026 20:30:57 +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 --- soong_workflow/wizard/soong_bounced_wizard.py | 2 +- .../wizard/soong_workflow_comment_wizard.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/soong_workflow/wizard/soong_bounced_wizard.py b/soong_workflow/wizard/soong_bounced_wizard.py index 90a4eb58f..fae7f19e6 100644 --- a/soong_workflow/wizard/soong_bounced_wizard.py +++ b/soong_workflow/wizard/soong_bounced_wizard.py @@ -16,7 +16,7 @@ class SoongBouncedWizard(models.Model): record = self.env[self.res_model].search([('id', '=', self.res_id)]) is_admin = current_user.has_group('base.group_system') or current_user.has_group('base.group_admin') log_ids = record.log_ids.sorted('sequence') - log_to_delete = log_ids.filtered(lambda log: log.name == record.state) + log_to_delete = log_ids.filtered(lambda log: log.msg_id) if not is_admin: invalid_logs = log_to_delete.filtered( lambda log: log.approval_state in ['1', '2'] diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index bdfc55e1d..4c087703b 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -687,8 +687,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): "node_btn_name": "0", }) result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id='18562027762', title=record_id._description, description=description, url=url, btntxt="查看详情") - # # msg_id = result_data[-1]['msgid'] - # log_id.msg_id = msg_id + msg_id = result_data[-1]['msgid'] + log_id.msg_id = msg_id for emp in self.dep_manager_employee_ids: workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.dep_manager_employee_ids if employee.user_id] next_node_id = record_id.workflow_id.node_ids.search([('name', '=', '承办'), ('workflow_id', '=', record_id.workflow_id.id)]) @@ -702,8 +702,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): "node_btn_name": "0", }) result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=emp.wecom_userid, title=record_id._description + "承办", description=description, url=url, btntxt="查看详情") - # msg_id = result_data[-1]['msgid'] - # log_id.msg_id = msg_id + msg_id = result_data[-1]['msgid'] + log_id.msg_id = msg_id for employee in self.circulated_employee_ids: workflow_record_id.users_ids = [(4, employee.user_id.id) for employee in self.circulated_employee_ids if employee.user_id] record_id = self.env[self.res_model].search([('id', '=', self.res_id)]) @@ -727,8 +727,8 @@ class SoongWorkflowCommentWizard(models.TransientModel): "approval_state": "0", }) result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id='18562027762', title=record_id._description + "传阅/抄送",description=description, url=url, btntxt="查看详情") - # msg_id = result_data[-1]['msgid'] - # log2_id.msg_id = msg_id + msg_id = result_data[-1]['msgid'] + log2_id.msg_id = msg_id workflow_record_id.employee_ids = self.dep_manager_employee_ids + self.employee_ids + self.circulated_employee_ids record_id.log_ids[-1].write({"comment": self.comment, "approval_state": "2", "lase_click_date": fields.Datetime.now()}) if self.node_btn_name == "收回":