添加功能
This commit is contained in:
@@ -201,10 +201,8 @@ class SoongWorkflowRecord(models.Model):
|
||||
# 第一步:基础过滤 - 只处理包含当前用户的记录
|
||||
base_domain = [('users_ids', 'in', [current_uid])]
|
||||
candidate_records = self.search(base_domain)
|
||||
|
||||
if not candidate_records:
|
||||
return [('id', '=', False)]
|
||||
|
||||
# 处理 "is_to_do = True" 或 "is_to_do != False" 的情况
|
||||
if (operator == '=' and value) or (operator == '!=' and not value):
|
||||
# 条件1:approve_state为start的记录ID
|
||||
|
||||
@@ -386,8 +386,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
return self.env['hr.employee'].sudo().search(domain)
|
||||
|
||||
elif link_users_group_ids:
|
||||
role_domain = ['|', ('user_role_id', 'in', link_users_group_ids.user_role_ids.ids),
|
||||
('user_role_ids', 'in', link_users_group_ids.user_role_ids.ids)]
|
||||
role_domain = ['|', '|', ('user_role_id', 'in', link_users_group_ids.user_role_ids.ids),
|
||||
('user_role_ids', 'in', link_users_group_ids.user_role_ids.ids),
|
||||
('role_group_ids', 'in', link_users_group_ids.ids)
|
||||
]
|
||||
if user_role_domain:
|
||||
role_domain = ['|'] + role_domain + user_role_domain
|
||||
domain = role_domain + company_domain + department_domain
|
||||
|
||||
Reference in New Issue
Block a user