diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py
index 2b2b94b50..e0101820b 100644
--- a/soong_workflow/models/soong_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -99,7 +99,7 @@ class YuthonUserRoleGroup(models.Model):
number = fields.Char(string="序号", store=True)
user_note = fields.Text(string="角色说明")
user_role_ids = fields.Many2many('soong.user.role', string='包含角色', index=True)
- company_id = fields.Many2one('res.company', string="所属公司", index=True, default=lambda self: self.env.company)
+ # company_id = fields.Many2one('res.company', string="所属公司", index=True, default=lambda self: self.env.company)
start_date = fields.Date(string="生效日期", default=fields.Datetime.today())
end_date = fields.Date(string="终止日期")
create_date = fields.Date(string="创建日期", default=fields.Datetime.today())
diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py
index 59a900d38..5dbc176a4 100644
--- a/soong_workflow/models/soong_workflow_node.py
+++ b/soong_workflow/models/soong_workflow_node.py
@@ -154,7 +154,8 @@ class SoongWorkflowNode(models.Model):
"review_type": btn.review_type,
"reviewer_id": btn.reviewer_id.id,
"reviewer_group_id": btn.reviewer_group_id.id,
- "users_role_id": btn.users_role_id.id
+ "users_role_id": btn.users_role_id.id,
+ "users_role_group_ids": btn.users_role_group_ids.ids,
})
@api.model_create_multi
diff --git a/soong_workflow/security/company_rule.xml b/soong_workflow/security/company_rule.xml
index 10237e752..71fcd341a 100644
--- a/soong_workflow/security/company_rule.xml
+++ b/soong_workflow/security/company_rule.xml
@@ -6,9 +6,9 @@
[('company_id', 'in', company_ids)]
-
- 角色多公司
-
- [('company_id', 'in', company_ids)]
-
+
+
+
+
+
\ No newline at end of file
diff --git a/soong_workflow/views/soong_user_role_views.xml b/soong_workflow/views/soong_user_role_views.xml
index 8f25a6dda..894dfc226 100644
--- a/soong_workflow/views/soong_user_role_views.xml
+++ b/soong_workflow/views/soong_user_role_views.xml
@@ -114,7 +114,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 36111f4c5..eb1de1c53 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -115,7 +115,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
cx = self.env.context.copy() or {}
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
for employee in self.employee_ids:
- action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])
+ action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]
url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid={employee.wecom_userid}#id={record_id.id}&cids=2&action={action_id.id}&model={record_id._name}&view_type=form'# &menu_id={menu_id.id}
self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa',
user_id=employee.wecom_userid,
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index 81f0d2dd2..4b95ecec6 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -22,6 +22,7 @@ class YuthonNotice(models.Model):
employee_ids = fields.Many2many('hr.employee', string="人员范围")
department_ids = fields.Many2many('hr.department', string='部门范围')
users_role_ids = fields.Many2many('soong.user.role', string='角色范围')
+ users_role_group_ids = fields.Many2many('soong.user.role.group', string='角色组')
notice_state = fields.Selection([('no', '未发布'), ('yes', '已发布'), ('stop', '已终止')], default='no',
string="公告状态")
notice_documents_ids = fields.Many2many('ir.attachment', string="附件")
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 364f5abf9..2a73514e2 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -69,10 +69,13 @@
-
+
+
+
+