添加功能
This commit is contained in:
@@ -501,13 +501,10 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
|
||||
# 检查是否为并审模式
|
||||
if self.approval_concatenation == 'bing': # 并审模式考勤异常
|
||||
# 获取当前节点应该审批的所有员工
|
||||
expected_employees = self.employee_ids
|
||||
# 就只是一个验证,应该让他不创建就好了,不用提示跳过就行
|
||||
# if record_id.log_ids2:
|
||||
# log_employee_id = record_id.log_ids2.mapped('done_by').employee_id.id
|
||||
# if log_employee_id in expected_employees.ids:
|
||||
# raise UserError('该员工已传阅,请勿重复转交')
|
||||
if record_id.log_ids2:
|
||||
log_employee_ids = record_id.log_ids2.mapped('done_by.employee_id.id')
|
||||
self.employee_ids = expected_employees.filtered(lambda emp: emp.id not in log_employee_ids)
|
||||
|
||||
# 查找下一个节点
|
||||
next_node_id = record_id.workflow_id.node_ids.search([
|
||||
@@ -525,7 +522,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
all_completed = len(completed_logs) == 0
|
||||
next_node_log_records = self.env["soong.workflow.log"]
|
||||
if all_completed:
|
||||
for employee in expected_employees:
|
||||
for employee in self.employee_ids:
|
||||
# 检查该员工在下一节点是否已有记录
|
||||
next_node_employee_log = self.sudo().env["soong.workflow.log"].search([
|
||||
("model", "=", self.res_model),
|
||||
|
||||
Reference in New Issue
Block a user