diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs index ec9e6e4..7fcd9bf 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs @@ -63,8 +63,9 @@ namespace APT.SK.WebApi.Controllers.Api var checkUsers = entity.Nav_CheckUsers; entity.Nav_CheckUsers = null; List detailIds = new List(); - //List hiddenIds = new List(); + List deleteCheckUserIds = new List(); List basicIds = new List(); + deleteCheckUserIds = this.GetEntities(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); detailIds = this.GetEntities(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); basicIds = this.GetEntities(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); //hiddenIds = this.GetEntities(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); @@ -76,6 +77,7 @@ namespace APT.SK.WebApi.Controllers.Api if (checkUsers != null && checkUsers.Any()) { checkUsers = checkUsers.Where(t => !t.IS_DELETED).ToList(); + checkUsers.ForEach(t => t.Nav_User = null); } if (details != null && details.Any()) { @@ -393,8 +395,8 @@ namespace APT.SK.WebApi.Controllers.Api { if (basicIds != null && basicIds.Any()) this.BantchDeleteEntityNoCommit(basicIds); - //if (hiddenIds != null && hiddenIds.Any()) - // this.BantchDeleteEntityNoCommit(hiddenIds); + if (deleteCheckUserIds != null && deleteCheckUserIds.Any()) + this.BantchDeleteEntityNoCommit(deleteCheckUserIds); if (detailIds != null && detailIds.Any()) this.BantchDeleteEntityNoCommit(detailIds); if (entity != null)