fix:轨迹是否对外从详情获取
This commit is contained in:
parent
d4c5c84779
commit
f4db3e852a
@ -194,20 +194,13 @@ public class TrackOrderService : ApplicationService
|
|||||||
if (system == null)
|
if (system == null)
|
||||||
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到指定id的子系统");
|
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到指定id的子系统");
|
||||||
|
|
||||||
var trackContent = await _trackContentRepository.GetListAsync(m => m.SubSystemId == input.SystemId);
|
|
||||||
if (trackContent == null)
|
|
||||||
return new UnifyResultDto<List<GetDetailTimelineOutput>>(false, "未找到子系统下的任何轨迹内容");
|
|
||||||
|
|
||||||
var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
|
var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id);
|
||||||
res.Data = new List<GetDetailTimelineOutput>();
|
res.Data = new List<GetDetailTimelineOutput>();
|
||||||
|
|
||||||
foreach (var item in trackDetails)
|
foreach (var item in trackDetails)
|
||||||
{
|
{
|
||||||
var currentTrackContet = trackContent.FirstOrDefault(m => m.Code == item.TrackCode);
|
|
||||||
|
|
||||||
|
|
||||||
//如果是外部系统,且轨迹内容不对外则跳过这条轨迹内容
|
//如果是外部系统,且轨迹内容不对外则跳过这条轨迹内容
|
||||||
if (system.SystemProperty == 2 && currentTrackContet != null && !currentTrackContet.IsExternal)
|
if (system.SystemProperty == 2 && !item.IsVisibility)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
res.Data.Add(new GetDetailTimelineOutput()
|
res.Data.Add(new GetDetailTimelineOutput()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user