diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 5b92b059a..ca8239de7 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -147,7 +147,7 @@ class SoongWorkflowRecord(models.Model): emp_to_user = {emp.id: emp.user_id.id for emp in all_employees if emp.user_id} for record in self: record.is_to_do = False - if record.approve_state == 'start' and set(active_employee_ids) & set(record.employee_ids.ids): + if record.approve_state == 'start' and set(active_employee_ids) & set(record.employee_ids.ids) and not record.reclaim_state: record.is_to_do = True continue # 原有逻辑:仅当新增条件不满足时,才执行原有log_ids/log_ids2判断 @@ -204,7 +204,7 @@ class SoongWorkflowRecord(models.Model): valid_ids = [] for rec in candidate_records: # 条件1:approve_state为start → 直接加入有效列表 - if rec.approve_state == 'start': + if rec.approve_state == 'start' and not rec.reclaim_state: valid_ids.append(rec.id) continue # 条件2:原有log_ids/log_ids2判断逻辑