|
@@ -64,7 +64,8 @@ namespace TEAMModelOS.Service
|
|
|
default: break;
|
|
|
}
|
|
|
}
|
|
|
- return tests;
|
|
|
+
|
|
|
+ return tests.OrderBy(x => x.order).ToList();
|
|
|
}
|
|
|
|
|
|
private static List<Models.ItemInfo> SingleConvert(string TypeKey, List<string> list)
|
|
@@ -306,6 +307,9 @@ namespace TEAMModelOS.Service
|
|
|
dtos.ForEach(x => { x.pShaCode = exercise.shaCode; x.lite = true; });
|
|
|
exercise.children.AddRange(dtos);
|
|
|
}
|
|
|
+ if (exercise.children.IsNotEmpty()) {
|
|
|
+ exercise.children = exercise.children.OrderBy(x => x.order).ToList();
|
|
|
+ }
|
|
|
exerciseDtos.Add(exercise);
|
|
|
}
|
|
|
return exerciseDtos;
|