Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe
This commit is contained in:
commit
dac80c8288
@ -12301,6 +12301,8 @@ namespace APT.BaseData.Services.DomainServices
|
||||
T_FM_NOTIFICATION_TASK notice = null;
|
||||
var majorUserIds = 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
|
||||
{
|
||||
@ -12360,6 +12364,10 @@ namespace APT.BaseData.Services.DomainServices
|
||||
this.UpdateEntityNoCommit(major);
|
||||
if (notice != null)
|
||||
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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user