From ae016ac7b3b46d58ba0b2caed01dfd99adafec1b 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: Sat, 13 Sep 2025 18:00:36 +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_workflow_comment_wizard.py | 3 +-- yuthon_property_approval/models/property_management.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index b91d71a79..a70f02524 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -226,8 +226,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): # 按当前申请人自动匹配-本部门（保留部门和公司条件） department_domain = ['|', ('department_id', '=', record_id.department_id.id), ('department_ids', 'in', record_id.department_id.id)] - company_domain = [('company_id', '=', record_id.company_id.id)] if hasattr(record_id, - 'company_id') else [] + company_domain = [('company_id', '=', applicant.company_id.id)] elif is_automatic_company and applicant and hasattr(applicant, 'company_id'): # 按当前申请人自动匹配-本公司（仅保留公司条件） diff --git a/yuthon_property_approval/models/property_management.py b/yuthon_property_approval/models/property_management.py index 5bd5889de..fb18de45d 100644 --- a/yuthon_property_approval/models/property_management.py +++ b/yuthon_property_approval/models/property_management.py @@ -17,7 +17,7 @@ class PropertyManagement(models.Model): reason_change = fields.Char(string="变更事由") user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user) department_id = fields.Many2one('hr.department', related='user_id.employee_id.department_id',string="申请人部门", store=True) - company_id = fields.Many2one('res.company', related='user_id..employee_id.company_id', string="公司", store=True) + company_id = fields.Many2one('res.company', related='user_id.employee_id.company_id', string="公司", store=True) handling_opinions = fields.Text(string="经办意见") management_line2_ids = fields.One2many('property.management.line2', 'property_management_id', string="原物业信息") management_line_ids = fields.One2many('property.management.line', 'property_management_id', string="物业信息")