diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index eadea99..c838aab 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -1191,12 +1191,7 @@ namespace Marco.Pms.Services.Service if (statusMapping != null) { response.Status = _mapper.Map(statusMapping.Status); - if (response.Status == null) - { - var status = statusTask.Result; - response.Status = _mapper.Map(status); - } - response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault(); + response.NextStatus = _mapper.Map>(statusMapping.NextStatus); if (response.NextStatus != null) { @@ -1206,6 +1201,12 @@ namespace Marco.Pms.Services.Service } } } + if (response.Status == null) + { + var status = statusTask.Result; + response.Status = _mapper.Map(status); + } + response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault(); foreach (var document in model.Documents) {