CelHRTeam/EchoTex_Payroll
14
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bug #22

Merged
chapal merged 1 commits from dev_chapal into devqc 2024-12-17 16:41:34 +06:00
Conversation 0 Commits 1 Files Changed 1 +6 -4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e974f1b6e - Show all commits

6
HRM.UI/Controllers/Payroll/BonusController.cs
View File

@ -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
} }
} }
if (oEmp != null)
{
prodSupervisor.EmpName = oEmp.Name; prodSupervisor.EmpName = oEmp.Name;
prodSupervisor.EmployeeNo = oEmp.EmployeeNo; prodSupervisor.EmployeeNo = oEmp.EmployeeNo;
}
} }
prodLine.ProdBonusParameters = _prodBonusParameterService.GetByLineID(prodLine.ID); prodLine.ProdBonusParameters = _prodBonusParameterService.GetByLineID(prodLine.ID);
Department oDept = new Department(); Department oDept = new Department();