From ed0acbfe90b8ac53030787513fc2ec9acd2560c7 Mon Sep 17 00:00:00 2001 From: Marvin Date: Sat, 18 Feb 2023 09:45:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E7=AB=99?= =?UTF-8?q?=E5=88=A5=E7=B6=AD=E8=AD=B7BAS010,=E6=8E=92=E5=BA=8F=E7=AB=99?= =?UTF-8?q?=E5=88=A5,=E5=85=88M=E5=BE=8CS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BAS/RuleStationsController.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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); } }