修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
334743f3f0
commit
01c5b96bc7
|
|
@ -111,7 +111,8 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
|
||||||
var startTime = maxVersion != null ? maxVersion.CreateTime :(data.SEGUpdateTime==null? DateTime.MinValue: data.SEGUpdateTime.Value);
|
var startTime = maxVersion != null ? maxVersion.CreateTime :(data.SEGUpdateTime==null? DateTime.MinValue: data.SEGUpdateTime.Value);
|
||||||
|
|
||||||
var segmentList = await _segmentRepository
|
var segmentList = await _segmentRepository
|
||||||
.Where(x=>x.CreateTime<= startTime)
|
.Where(x=>x.CreateTime<= startTime && (!x.IsDeleted||x.DeletedTime> startTime))
|
||||||
|
|
||||||
.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
|
.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
|
if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
|
||||||
|
|
@ -268,7 +269,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
|
||||||
public async Task<IResponseOutput> DeleteSegment(Guid segmentId)
|
public async Task<IResponseOutput> DeleteSegment(Guid segmentId)
|
||||||
{
|
{
|
||||||
await DeleteBindingsAndAnswersAsync(null, segmentId);
|
await DeleteBindingsAndAnswersAsync(null, segmentId);
|
||||||
var success = await _segmentRepository.DeleteFromQueryAsync(t => t.Id == segmentId, true);
|
var success = await _segmentRepository.SoftDeleteFromQueryAsync(t => t.Id == segmentId, true);
|
||||||
return ResponseOutput.Ok();
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue