diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs index 616b5b7..d51673a 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs @@ -110,7 +110,7 @@ namespace APT.FO.WebApi.Controllers entity.Nav_Users = null; if (users != null && users.Any()) { - foreach (var use in users) + foreach (var use in users.Where(t=>!t.IS_DELETED)) { T_FO_LEADER_WELL_RECORD_USER item = new T_FO_LEADER_WELL_RECORD_USER(); item.ORG_ID = entity.ORG_ID; @@ -281,7 +281,7 @@ namespace APT.FO.WebApi.Controllers } else { - var sendAfterUserIds = afterUserList.Where(t => t.AFTER_USER_ID != loginUserId && t.AFTER_USER_ID != null).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); + var sendAfterUserIds = afterUserList.Where(t => t.AFTER_USER_ID != null).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); if (sendAfterUserIds != null && sendAfterUserIds.Any()) { //触发给接班人签字确认 @@ -378,7 +378,7 @@ namespace APT.FO.WebApi.Controllers } else { - var afterUserIds = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == record.ID && t.AFTER_USER_ID != userID && t.AFTER_USER_ID != null, new BaseFilter(orgId)).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); + var afterUserIds = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == record.ID && t.AFTER_USER_ID != null, new BaseFilter(orgId)).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); if (afterUserIds != null && afterUserIds.Any()) { //触发给接班人签字确认 @@ -405,7 +405,7 @@ namespace APT.FO.WebApi.Controllers if (todoCount == 0) { var detailIds = details.Select(m => m.ID).ToList(); - var afterUserIds = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == record.ID && t.AFTER_USER_ID != userID && t.AFTER_USER_ID != null, new BaseFilter(orgId)).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); + var afterUserIds = this.GetEntities(t => t.LEADER_WELL_RECORD_ID == record.ID && t.AFTER_USER_ID != null, new BaseFilter(orgId)).Select(m => (Guid)m.AFTER_USER_ID).Distinct().ToList(); if (afterUserIds != null && afterUserIds.Any()) { //触发给接班人签字确认