forked from ddrilling/AsbCloudServer
fix merge
This commit is contained in:
parent
0fb65c7e83
commit
2f0af62829
@ -259,7 +259,8 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
|
||||
operation.DepthEnd,
|
||||
})
|
||||
.First(),
|
||||
});
|
||||
})
|
||||
.Where(s => idsWells.Contains(s.IdWell));
|
||||
var dbData = await query.ToArrayAsync(token);
|
||||
var sections = dbData.Select(
|
||||
item => new SectionByOperationsDto
|
||||
@ -283,8 +284,7 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
|
||||
return sections;
|
||||
});
|
||||
|
||||
var sections = cache.Where(s => idsWells.Contains(s.IdWell));
|
||||
return sections;
|
||||
return cache;
|
||||
}
|
||||
|
||||
public async Task<DatesRangeDto?> GetDatesRangeAsync(int idWell, int idType, CancellationToken cancellationToken)
|
||||
|
Loading…
Reference in New Issue
Block a user