diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index d55310fd..4ccdf66c 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -304,7 +304,7 @@ namespace BLL } else { - return null; + return getDataLists; } } } diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 9618d758..854cbbec 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -101,8 +101,8 @@ namespace BLL } else { - var person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId); - if (person != null && plan.ProjectId == person.ProjectId && plan.UnitIds.Contains(person.UnitId) + var person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && plan.ProjectId == e.ProjectId); + if (person != null && plan.UnitIds.Contains(person.UnitId) && (string.IsNullOrEmpty(plan.WorkPostId) || plan.WorkPostId.Contains(person.WorkPostId))) { var trainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == plan.TrainTypeId); @@ -139,7 +139,7 @@ namespace BLL } else { - alterString = "人员与培训计划不匹配!"; + alterString = "人员项目、单位、岗位与培训计划不匹配!"; } } }