From 41021d4714a12f48ba4ad7733fdbb322d4c4a54f 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: Sun, 16 Nov 2025 14:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/PF/PFApproveCallBackService.cs   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index adf9a7b..1255e05 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -14714,10 +14714,10 @@ namespace APT.BaseData.Services.DomainServices
                         var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value);
                         if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
                         {
-                            result.STATUS = PFStandardStatus.Archived;
-                            if (user != null && resultDetails != null && resultDetails.Any())
+                            result.STATUS = PFStandardStatus.Archived;
+                            var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
+                            if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
                             {
-                                var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
                                 //var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
                                 //var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && productionIds.Contains(t.PRODUCTION_UNIT_ID), new BaseFilter(entity.ORG_ID));
                                 //var libraryIds = librarys.Select(t => t.ID).ToList();
@@ -15038,18 +15038,18 @@ namespace APT.BaseData.Services.DomainServices
                 //触发风险检查关联表
                 T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
                 T_FM_NOTIFICATION_TASK notice = null;
-                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
+                List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
                 //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
                 //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
-                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
+                //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
+                entity.Nav_Details = entity.Nav_Details.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
                 if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
                 {
-                    entity.Nav_Details = entity.Nav_Details.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
                     //var sumDetailIds = entity.Nav_Details.Select(t => t.ID).ToList();
                     //var sumDetailPosts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
                     //var sumPostIds = sumDetailPosts.Select(t => t.ID).ToList();