From 695ce147b3f2284fb3ddbc6fbe1d49912aa8f68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Mon, 9 Mar 2026 21:21:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 5b92b059a..ad06d90a8 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 record.reclaim_state:
                     valid_ids.append(rec.id)
                     continue
                 # 条件2：原有log_ids/log_ids2判断逻辑

From b580241502ffdfd87d289f279e5c1336bcbfcc47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Mon, 9 Mar 2026 21:21:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index ad06d90a8..ca8239de7 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -204,7 +204,7 @@ class SoongWorkflowRecord(models.Model):
             valid_ids = []
             for rec in candidate_records:
                 # 条件1：approve_state为start → 直接加入有效列表
-                if rec.approve_state == 'start' and not record.reclaim_state:
+                if rec.approve_state == 'start' and not rec.reclaim_state:
                     valid_ids.append(rec.id)
                     continue
                 # 条件2：原有log_ids/log_ids2判断逻辑