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

Compare commits

base: CelHRTeam:c576cea7d7ec025cc08fa9cbed8eccafecb5c186
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:f784e6f7e9ecc1b32d1c000862e2d9c91bad8e35
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "c576cea7d7ec025cc08fa9cbed8eccafecb5c186" and "f784e6f7e9ecc1b32d1c000862e2d9c91bad8e35" have entirely different histories.
c576cea7d7 ... f784e6f7e9

1 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -476,7 +476,7 @@ namespace HRM.UI.Controllers.Payroll
foreach (ProdBonusSupervisor prodSupervisor in prodLine.ProdBonusSupervisors)
{
oEmp = new EmployeeService().Get(prodSupervisor.EmployeeID);
if (oEmp!=null && oEmp.DepartmentID != null)
if (oEmp.DepartmentID != null)
{
var dev = detps.FirstOrDefault(x => x.ID == oEmp.DepartmentID);
@ -503,11 +503,9 @@ namespace HRM.UI.Controllers.Payroll
}
}
if (oEmp != null)
{
prodSupervisor.EmpName = oEmp.Name;
prodSupervisor.EmployeeNo = oEmp.EmployeeNo;
}
prodSupervisor.EmpName = oEmp.Name;
prodSupervisor.EmployeeNo = oEmp.EmployeeNo;
}
prodLine.ProdBonusParameters = _prodBonusParameterService.GetByLineID(prodLine.ID);
Department oDept = new Department();