lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
高飞 2022-09-12 14:58:43 +08:00
parent 6908efcf2c 6910ce5f02
commit e0ba13fd2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/APIUserService.cs
View File

@ -304,7 +304,7 @@ namespace BLL
}
else
{
return null;
return getDataLists;
}
}
}

6
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
View File

@ -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 = "人员项目、单位、岗位与培训计划不匹配!";
}
}
}