diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index 9e6399a..b272e94 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -130,14 +130,22 @@ namespace APT.FM.WebApi.Controllers.Api.FM filterRuleDelete.Value = "false"; filterRuleDelete.IsSysParamRule = false; filterRuleDelete.Operate = FilterOperate.Equal; + + FilterRule filterRuleENABLE = new FilterRule(); + filterRuleENABLE.Field = "ENABLE_STATUS"; + filterRuleENABLE.Value = "0"; + filterRuleENABLE.IsSysParamRule = false; + filterRuleENABLE.Operate = FilterOperate.Equal; if (pageFilter.FilterGroup.Rules == null) { pageFilter.FilterGroup.Rules = new List(); pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + pageFilter.FilterGroup.Rules.Add(filterRuleENABLE); } else { pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + pageFilter.FilterGroup.Rules.Add(filterRuleENABLE); } return WitOrderPaged(null, pageFilter); } diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index e27628e..1d3b4b8 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -179,7 +179,21 @@ namespace APT.SC.WebApi.Controllers.Api.SE } } } - + else if (data.Nav_Notify != null && data.Nav_Notify.CHECKTYPE == PlanCheckType.InOffLine) + { + //参加的就要有考核结果 + int rowindex = 1; + foreach (var item in joinUsers) + { + if (item.IS_DELETED) + continue; + if (item.STATUS == SETrainRecordUserStatusEnum.参与 && !item.EXAMINATION_RESULTS.HasValue) + { + throw new Exception("请填写行【" + rowindex + "】的考核结果!"); + } + rowindex++; + } + } entity.TRAIN_COUNT = joinUsers.Count(t => t.STATUS == SETrainRecordUserStatusEnum.参与); var allSendTitles = new List();