bug
This commit is contained in:
parent
55590f8035
commit
9e974f1b6e
|
@ -476,7 +476,7 @@ namespace HRM.UI.Controllers.Payroll
|
||||||
foreach (ProdBonusSupervisor prodSupervisor in prodLine.ProdBonusSupervisors)
|
foreach (ProdBonusSupervisor prodSupervisor in prodLine.ProdBonusSupervisors)
|
||||||
{
|
{
|
||||||
oEmp = new EmployeeService().Get(prodSupervisor.EmployeeID);
|
oEmp = new EmployeeService().Get(prodSupervisor.EmployeeID);
|
||||||
if (oEmp.DepartmentID != null)
|
if (oEmp!=null && oEmp.DepartmentID != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
var dev = detps.FirstOrDefault(x => x.ID == oEmp.DepartmentID);
|
var dev = detps.FirstOrDefault(x => x.ID == oEmp.DepartmentID);
|
||||||
|
@ -503,9 +503,11 @@ namespace HRM.UI.Controllers.Payroll
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prodSupervisor.EmpName = oEmp.Name;
|
if (oEmp != null)
|
||||||
prodSupervisor.EmployeeNo = oEmp.EmployeeNo;
|
{
|
||||||
|
prodSupervisor.EmpName = oEmp.Name;
|
||||||
|
prodSupervisor.EmployeeNo = oEmp.EmployeeNo;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
prodLine.ProdBonusParameters = _prodBonusParameterService.GetByLineID(prodLine.ID);
|
prodLine.ProdBonusParameters = _prodBonusParameterService.GetByLineID(prodLine.ID);
|
||||||
Department oDept = new Department();
|
Department oDept = new Department();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user