Rewrite the uf condiotn in get expense details API
This commit is contained in:
parent
61741331e0
commit
5b091a8d6f
@ -1191,12 +1191,7 @@ namespace Marco.Pms.Services.Service
|
|||||||
if (statusMapping != null)
|
if (statusMapping != null)
|
||||||
{
|
{
|
||||||
response.Status = _mapper.Map<ExpensesStatusMasterVM>(statusMapping.Status);
|
response.Status = _mapper.Map<ExpensesStatusMasterVM>(statusMapping.Status);
|
||||||
if (response.Status == null)
|
|
||||||
{
|
|
||||||
var status = statusTask.Result;
|
|
||||||
response.Status = _mapper.Map<ExpensesStatusMasterVM>(status);
|
|
||||||
}
|
|
||||||
response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault();
|
|
||||||
response.NextStatus = _mapper.Map<List<ExpensesStatusMasterVM>>(statusMapping.NextStatus);
|
response.NextStatus = _mapper.Map<List<ExpensesStatusMasterVM>>(statusMapping.NextStatus);
|
||||||
if (response.NextStatus != null)
|
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<ExpensesStatusMasterVM>(status);
|
||||||
|
}
|
||||||
|
response.Status.PermissionIds = permissionStatusMappings.Where(ps => ps.StatusId == Guid.Parse(model.StatusId)).Select(ps => ps.PermissionIds).FirstOrDefault();
|
||||||
|
|
||||||
foreach (var document in model.Documents)
|
foreach (var document in model.Documents)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user