This commit is contained in:
何美荣 2025-11-16 14:57:23 +08:00
parent 89db85f53e
commit 41021d4714

View File

@ -14715,9 +14715,9 @@ namespace APT.BaseData.Services.DomainServices
if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID) if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
{ {
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
if (user != null && resultDetails != null && resultDetails.Any())
{
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{
//var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().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 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(); //var libraryIds = librarys.Select(t => t.ID).ToList();
@ -15047,9 +15047,9 @@ namespace APT.BaseData.Services.DomainServices
//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_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_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_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()) 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 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 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(); //var sumPostIds = sumDetailPosts.Select(t => t.ID).ToList();