From 6910ce5f028b8622283afcd98f4e37450664caa6 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 12 Sep 2022 09:21:18 +0800 Subject: [PATCH] =?UTF-8?q?20220912api=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E4=BA=BA=E5=91=98=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8B=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/API/APIUserService.cs | 2 +- SGGL/BLL/API/HSSE/APITrainingTaskService.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 = "人员项目、单位、岗位与培训计划不匹配!"; } } }