wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:560c982055956c7950e0b555ccb49b603c1dfbcd
Branches Tags
wyw:master
..
compare: wyw:cae6ba7cdcdc2196e6f4e6efa96302d13128b28e
Branches Tags
wyw:master

No commits in common. "560c982055956c7950e0b555ccb49b603c1dfbcd" and "cae6ba7cdcdc2196e6f4e6efa96302d13128b28e" have entirely different histories.
560c982055 ... cae6ba7cdc

1 changed files with 2 additions and 10 deletions
Show Stats Expand all files Collapse all files

8
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -12301,8 +12301,6 @@ namespace APT.BaseData.Services.DomainServices
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
var majorUserIds = new List<Guid>(); 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) if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null)
{ {
//先查下销号表是否已经触发过 //先查下销号表是否已经触发过
@ -12324,8 +12322,6 @@ namespace APT.BaseData.Services.DomainServices
major.MONITOR_OPINION = null; 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(); 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(); 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 else
{ {
@ -12364,10 +12360,6 @@ namespace APT.BaseData.Services.DomainServices
this.UpdateEntityNoCommit(major); this.UpdateEntityNoCommit(major);
if (notice != null) 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; return true;