fill position with jobTitle if empty, in OrderList

MTWorkHR.Application/Services/User/OrderRequestService.cs

@@ -150,7 +150,7 @@ namespace MTWorkHR.Application.Services
                     var user = await _userService.GetUserWithAttachmentById(item.RequestingEmployeeId);
                     if (user != null)
                     {
-                        item.Employee = new EmployeeDto { Id = item.RequestingEmployeeId, FirstName = user.FirstName, LastName = user.LastName, Email = user.Email, Position = user.Position };
+                        item.Employee = new EmployeeDto { Id = item.RequestingEmployeeId, FirstName = user.FirstName, LastName = user.LastName, Email = user.Email, Position = !string.IsNullOrEmpty( user.Position )? user.Position  : user.JobTitleName };
                         var attach = user.UserAttachments?.FirstOrDefault(a => a.AttachmentTypeId == 9);
                         item.Employee.ProfileImagePath = attach?.FilePath;
                        // if (attach != null)

MTWorkHR.Application/Services/User/UserService.cs

@@ -156,7 +156,7 @@ namespace MTWorkHR.Application.Services
         }
         public async Task<UserDto> GetUserWithAttachmentById(string id)
         {
-            var entity = await _userManager.Users.Include(u=> u.UserAttachments)
+            var entity = await _userManager.Users.Include(u=> u.UserAttachments).Include(u=> u.JobTitle)
                 .FirstOrDefaultAsync(x => x.Id == id);
             var response = MapperObject.Mapper.Map<UserDto>(entity);