diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs
index f84f4294..9996c9b7 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/TrackTemplateOutputVo.cs
@@ -54,4 +54,9 @@ public class TemplateContentDtoVo
/// 轨迹节点
///
public string Node { get; set; }
+
+ ///
+ /// 排序键
+ ///
+ public int Sort { get; set; }
}
diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
index d399bcd1..2f9b4a2d 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
@@ -214,7 +214,8 @@ public class TrackTemplateRepository : BasicRepository, ITr
ContentCn = b.Content,
ContentEn = b.EnContent,
Status = c.Status,
- Node = d.NodeName
+ Node = d.NodeName,
+ Sort = a.Sort
})
.ToListAsync();
@@ -222,7 +223,8 @@ public class TrackTemplateRepository : BasicRepository, ITr
{
var templateContents = contents.Where(x => x.TemplateId == template.Id).ToList();
- template.TemplateContents = templateContents;
+ //根据排序键排序
+ template.TemplateContents = templateContents.OrderBy(x => x.Sort).ToList();
}
return templates;
@@ -262,10 +264,13 @@ public class TrackTemplateRepository : BasicRepository, ITr
ContentCn = b.Content,
ContentEn = b.EnContent,
Status = c.Status,
- Node = d.NodeName
+ Node = d.NodeName,
+ Sort = a.Sort
})
.ToPagedListAsync(input.PageIndex, input.PageSize);
+ //返回轨迹模板内容时按排序键排序
+ contents.List = contents.List.OrderBy(x => x.Sort).ToList();
return contents;
}