From c78fd9c4277efca34db79ae9077d64674e13458d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Mon, 5 Jan 2026 21:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_hr_employee.py            | 1 +
 soong_workflow/views/soong_hr_employee_views.xml      | 1 +
 yuthon_hr_employee/views/inherit_hr_job_views.xml     | 2 +-
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/models/soong_hr_employee.py b/soong_workflow/models/soong_hr_employee.py
index f81dfb1da..42f4558f1 100644
--- a/soong_workflow/models/soong_hr_employee.py
+++ b/soong_workflow/models/soong_hr_employee.py
@@ -8,6 +8,7 @@ class YuthonHrEmployee(models.Model):
     user_role_id = fields.Many2one('soong.user.role', string="主角色")
     user_role_ids = fields.Many2many('soong.user.role', string="辅助角色")
     department_ids = fields.Many2many('hr.department', string="辅助部门")
+    user_role_group_id = fields.Many2many('soong.user.role.group', string='角色组', related='user_role_id.user_role_group_ids')
     bank_account = fields.Char()
 
     @api.onchange('user_role_id')
diff --git a/soong_workflow/views/soong_hr_employee_views.xml b/soong_workflow/views/soong_hr_employee_views.xml
index f31bd1604..3a86813e0 100644
--- a/soong_workflow/views/soong_hr_employee_views.xml
+++ b/soong_workflow/views/soong_hr_employee_views.xml
@@ -8,6 +8,7 @@
             <xpath expr="//field[@name='work_email']" position="after">
                 <field name="user_role_id" domain="[('company_id', '=', company_id)]"/>
                 <field name="user_role_ids" widget="many2many_tags" domain="[('company_id', '=', company_id)]"/>
+                <field name="user_role_group_id" widget="many2many_tags" domain="[('company_id', '=', company_id)]" />
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
                 <field name="department_ids" widget="many2many_tags"/>
diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml
index 845d9b0d1..312856978 100644
--- a/yuthon_hr_employee/views/inherit_hr_job_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml
@@ -82,7 +82,7 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
-<!--                <field name="allowed_user_ids" invisible="1"/>-->
+                <field name="allowed_user_ids" invisible="1"/>
                 <field name="number"/>
                 <field name="establishment_quotas"/>
                 <field name="no_of_employee" string="在编人数"/>
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 0ad85d1b5..26516e256 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -602,7 +602,7 @@
                 <filter name="group_is_membership" string="工会会员" context="{'group_by': 'is_membership'}"/>
             </xpath>
             <xpath expr="//search" position="inside">
-                <header_search>
+                <header_search class="header-search-inline">
                     <quick_filter string="状态">
                         <filter string="在职" name="user_state" domain="[('user_state', '=', 'in')]"/>
                         <filter string="离职" name="to_do" domain="[('user_state', '=', 'leave')]"/>