From a405cfec1371497e21c49f631c0650d92d92cfa0 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Tue, 23 Sep 2025 13:24:19 +0530 Subject: [PATCH] If team meamber not found send empty --- .../Controllers/AttendanceController.cs | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs index 3703c69..83d4e9a 100644 --- a/Marco.Pms.Services/Controllers/AttendanceController.cs +++ b/Marco.Pms.Services/Controllers/AttendanceController.cs @@ -372,27 +372,26 @@ namespace MarcoBMS.Services.Controllers foreach (Attendance attende in lstAttendance) { - var result1 = new EmployeeAttendanceVM() - { - Id = attende.Id, - CheckInTime = attende.InTime, - CheckOutTime = attende.OutTime, - Activity = attende.Activity, - EmployeeAvatar = null, - EmployeeId = attende.EmployeeID, - - }; - var teamMember = projectteam.Find(m => m.EmployeeId == attende.EmployeeID); if (teamMember != null && teamMember.Employee != null && teamMember.Employee.JobRole != null) { - result1.FirstName = teamMember.Employee.FirstName; - result1.LastName = teamMember.Employee.LastName; - result1.JobRoleName = teamMember.Employee.JobRole.Name; - result1.OrganizationName = teamMember.Employee.Organization?.Name; + var result1 = new EmployeeAttendanceVM() + { + Id = attende.Id, + CheckInTime = attende.InTime, + CheckOutTime = attende.OutTime, + Activity = attende.Activity, + EmployeeAvatar = null, + EmployeeId = attende.EmployeeID, + FirstName = teamMember.Employee.FirstName, + LastName = teamMember.Employee.LastName, + JobRoleName = teamMember.Employee.JobRole.Name, + OrganizationName = teamMember.Employee.Organization?.Name + }; + result.Add(result1); } - result.Add(result1); + } result.Sort(delegate (EmployeeAttendanceVM x, EmployeeAttendanceVM y)