From e2d866f24806653f58f4804bcb935cc3ee40d97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Thu, 9 Apr 2026 16:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=8F=B7=E8=A1=A8=E6=B8=85=E6=A5=9A?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/PF/PFApproveCallBackService.cs          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 5bab0f4..1ebf06d 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -12300,7 +12300,9 @@ namespace APT.BaseData.Services.DomainServices
                 T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null;
                 T_FM_NOTIFICATION_TASK notice = null;
                 var majorUserIds = new List<Guid>();
-                var majorFileIds = new List<Guid>();
+                var majorFileIds = new List<Guid>();
+                var approveIds = new List<Guid>();
+                var approveDetailIds = new List<Guid>();
                 if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null)
                 {
                     //先查下销号表是否已经触发过
@@ -12322,6 +12324,8 @@ namespace APT.BaseData.Services.DomainServices
                         major.MONITOR_OPINION = null;
                         majorUserIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
                         majorFileIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
+                        approveIds = this.GetEntities<T_PF_APPROVE>(t => t.DATA_ID != null && t.DATA_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
+                        approveDetailIds = this.GetEntities<T_PF_APPROVE_DETAIL>(t => t.APPROVE_ID != null && approveIds.Contains(t.APPROVE_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
                     }
                     else
                     {
@@ -12359,7 +12363,11 @@ namespace APT.BaseData.Services.DomainServices
                     if (major != null)
                         this.UpdateEntityNoCommit(major);
                     if (notice != null)
-                        this.UpdateEntityNoCommit(notice);
+                        this.UpdateEntityNoCommit(notice);
+                    if (approveDetailIds != null && approveDetailIds.Any())
+                        this.BantchDeleteEntityNoCommit<T_PF_APPROVE_DETAIL>(approveDetailIds);
+                    if (approveIds != null && approveIds.Any())
+                        this.BantchDeleteEntityNoCommit<T_PF_APPROVE>(approveIds);
                 });
             }
             return true;