From d572e5115b04bc6a4b0df8905c5a45a3fee725dd Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Thu, 27 Nov 2025 18:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/service/impl/JenkinsBuildServiceImpl.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
index 574e101b..fe2fe571 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/JenkinsBuildServiceImpl.java
@@ -98,6 +98,9 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
 
     @Resource
     private INotificationSendService notificationSendService;
+    
+    @Resource
+    private jakarta.persistence.EntityManager entityManager;
 
     @Resource(name = "jenkinsTaskExecutor")
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@@ -109,6 +112,7 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
         doSyncBuilds(externalSystemId, null, null);
         
         // 同步完成后检查并发送构建通知
+        // 注意：checkBuildNotifications 内部会处理异常，不会影响同步事务
         checkBuildNotifications(externalSystemId);
     }
 
@@ -649,10 +653,14 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
             }
             
         } catch (org.springframework.orm.ObjectOptimisticLockingFailureException e) {
-            // 乐观锁冲突，说明记录已被其他线程更新，忽略即可
+            // 乐观锁冲突，说明记录已被其他线程更新
+            // 清除持久化上下文，避免脏数据影响后续操作
+            entityManager.clear();
             log.warn("构建通知记录乐观锁冲突，跳过处理: teamId={}, envId={}, buildId={}", 
                 config.getTeamId(), config.getEnvironmentId(), build.getId());
         } catch (Exception e) {
+            // 清除持久化上下文，避免脏数据影响后续操作
+            entityManager.clear();
             log.error("处理构建通知失败: teamId={}, envId={}, buildId={}", 
                 config.getTeamId(), config.getEnvironmentId(), build.getId(), e);
         }