diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs index 74782844..213ad458 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs @@ -78,11 +78,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS } if (page > 0) { - q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit); } else { - q = q.OrderBy(p => p.Sequence); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType); } try @@ -138,11 +138,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS if (page > 0) { - q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit); } else { - q = q.OrderBy(p => p.Sequence); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType); } } else @@ -164,11 +164,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS if (page > 0) { - q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit); } else { - q = q.OrderBy(p => p.Sequence); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType); } } } @@ -180,11 +180,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS } if (page > 0) { - q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit); } else { - q = q.OrderBy(p => p.Sequence); + q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType); } }