diff --git a/IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs b/IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs index 2709032f1..115f0fa5b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs +++ b/IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs @@ -92,7 +92,15 @@ public class SegmentationService(IRepository _segmentationReposito private async Task SaveSegmentationVersionAsync(SaveSegmentationVersionAsyncInDto inDto) { var data = await _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == inDto.SegmentationId); - var segmentList = await _segmentRepository.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + + var lastVersion=await _segmentationVersionRepository + .Where(x => x.SegmentationId == inDto.SegmentationId) + .OrderByDescending(x => x.Version) + .FirstOrDefaultAsync(); + + var segmentList = await _segmentRepository + .WhereIf(lastVersion!=null,x=>x.CreateTime<= lastVersion.CreateTime) + .Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore)) {