diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py index 27c5cb383..71464851c 100644 --- a/soong_workflow/models/soong_user_role.py +++ b/soong_workflow/models/soong_user_role.py @@ -22,6 +22,7 @@ class YuthonUserRole(models.Model): personnel = fields.Text(string="在岗人员", store=True) employee_ids = fields.One2many('hr.employee', 'user_role_id') child_ids = fields.One2many('soong.user.role', 'parent_id', string='下级角色', index=True) + company_id = fields.Many2one('res.company', string="所属公司") pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True) def write(self, vals): diff --git a/soong_workflow/views/soong_user_role_views.xml b/soong_workflow/views/soong_user_role_views.xml index cbe65a816..29f747153 100644 --- a/soong_workflow/views/soong_user_role_views.xml +++ b/soong_workflow/views/soong_user_role_views.xml @@ -28,6 +28,7 @@ + diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py index 6308677b6..9dfec9b8e 100644 --- a/yuthon_hr_employee/models/yuthon_hr_department.py +++ b/yuthon_hr_employee/models/yuthon_hr_department.py @@ -26,6 +26,7 @@ class YuthonHrDepartment(models.Model): expiration_date = fields.Date(string="失效日期", default=fields.Date.today()) end_date = fields.Date(string="结束时间") department_code = fields.Char(string="部门序号") + company_id = fields.Many2one('res.company', string="所属公司") pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True) def do_department_to_res_groups(self): diff --git a/yuthon_hr_employee/views/yuthon_hr_department_views.xml b/yuthon_hr_employee/views/yuthon_hr_department_views.xml index 71420248a..3a7a237e6 100644 --- a/yuthon_hr_employee/views/yuthon_hr_department_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_department_views.xml @@ -32,6 +32,7 @@ + 1