diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index 4dbfbcb15..18b199522 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -107,13 +107,19 @@ class RoomBooking(models.Model):
department_users_list = users_role_list = []
for users in self:
if users.department_ids:
+ # 查看是否下级部门
+ if users.department_ids.child_ids:
+ for child in users.department_ids.child_ids:
+ department_child_users_data = users.env['hr.employee'].search([('department_id', '=', child.id.origin)])
+ department_users_list += [de.user_id.id for de in department_child_users_data]
for depart in users.department_ids:
department_users_data = users.env['hr.employee'].search([('department_id', '=', depart.id.origin)])
department_users_list = [de.user_id.id for de in department_users_data]
employee_users_list = users.employee_ids.user_id.ids
if users.users_role_ids:
for user_id in users.users_role_ids:
- user_role_data = users.env['hr.employee'].search([('user_role_id', '=', user_id.id.origin)])
+ user_role_data = users.env['hr.employee'].search(['|', ('user_role_id', '=', user_id.id.origin),
+ ('user_role_ids', '=', user_id.id.origin)])
users_role_list = [ro.user_id.id for ro in user_role_data]
publish_user_list = department_users_list + employee_users_list + users_role_list
users.room_users_ids = [(6, 0, list(set(publish_user_list)))]
diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py
index f3bb05a2e..45634963a 100644
--- a/soong_workflow/models/soong_workflow.py
+++ b/soong_workflow/models/soong_workflow.py
@@ -32,6 +32,7 @@ MODEL_DOMAIN = """[
class SoongWorkflow(models.Model):
_name = "soong.workflow"
_description = "Soong Workflow"
+ _order = 'sequence asc'
_sql_constraints = [
("uniq_name", "unique(name)", _("Workflow name must be unique.")),
@@ -39,6 +40,7 @@ class SoongWorkflow(models.Model):
]
name = fields.Char(string="Name", help="Give workflow a name.")
+ sequence = fields.Integer(string='序号')
model_id = fields.Many2one("ir.model", string="Model", domain=MODEL_DOMAIN, help="Enter business model you would like to modify its workflow.", )
node_ids = fields.One2many(comodel_name="soong.workflow.node", inverse_name="workflow_id", string="Nodes")
link_ids = fields.One2many(comodel_name="soong.workflow.link", inverse_name="workflow_id", string="Links")
diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml
index a108c08eb..7d35d01f5 100644
--- a/soong_workflow/views/menuitem.xml
+++ b/soong_workflow/views/menuitem.xml
@@ -11,20 +11,15 @@
groups="group_soong_workflow_manager"
sequence="200"/>
-
-
diff --git a/soong_workflow/views/soong_workflow_views.xml b/soong_workflow/views/soong_workflow_views.xml
index c1592c2a4..8d232d9c3 100644
--- a/soong_workflow/views/soong_workflow_views.xml
+++ b/soong_workflow/views/soong_workflow_views.xml
@@ -54,6 +54,7 @@
soong.workflow
+
diff --git a/yuthon_work_brand/views/work_menus.xml b/yuthon_work_brand/views/work_menus.xml
index a3bb550d3..67946b167 100644
--- a/yuthon_work_brand/views/work_menus.xml
+++ b/yuthon_work_brand/views/work_menus.xml
@@ -69,18 +69,14 @@
name="工作流程"
parent="spreadsheet_dashboard.spreadsheet_dashboard_menu_root"
sequence="5"/>
-