diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 1c37f744..908d7227 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -53,7 +53,7 @@ namespace SJZY.Track.Application.Services.TrackOrders
                     TrackTemplateIds = input.TrackTemplateIds,
                     TrackCodes=trackCodes
                 });
-
+                input.TrackTemplateIds =input.TrackTemplateIds.Where(a => a>0).ToList();
                 int id = 1;
                 list.ForEach(a =>
                 {
@@ -61,7 +61,13 @@ namespace SJZY.Track.Application.Services.TrackOrders
 
                     var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code
                     && input.TrackTemplateIds.Contains(b.TrackTemplateId));
-                    var trackContent = trackContentsOfTemplates.FirstOrDefault();
+                    GetTemplateContentAttributeValueVO trackContent = null;
+                    var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList();
+                    if (!insertData.IsNullOrEmpty())
+                    {
+                        trackContent  =trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId==insertData.FirstOrDefault());
+                    }
+
                     if (trackContent!=null)
                     {
                         a.IsCanDelete=trackContent.IsCanDelete;
diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs
index 72cf57ba..7609c5a6 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs
@@ -103,6 +103,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
             .WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId)
             .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id))
             .Where((a, b, c) => c.Id>0)
+            //.OrderByIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => SqlFunc.IIF(input.TrackTemplateIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), c.CreateTime), OrderByType.Desc)
             .Select((a, b, c) => new GetTemplateContentAttributeValueVO
             {
                 IsCanDelete=b.IsCanDelete,