From fc0507790aead192c342bd49ad1cf8e22b3a77be Mon Sep 17 00:00:00 2001
From: marvinhong <marvinhong@163.com>
Date: Wed, 13 Oct 2021 23:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E8=A7=84?=
=?UTF-8?q?=E5=88=99=E6=8E=92=E5=BA=8F=E6=9D=A1=E4=BB=B6=E5=8F=AA=E6=9C=89?=
=?UTF-8?q?RuleSeq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs
index 21a51d96..d276a670 100644
--- a/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs
@@ -73,7 +73,8 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
CurrStationId = q2.StationID,
NextStationId = q3.StationID
};
- query = query.OrderBy(p => p.RuleStationID + p.RuleSeq);
+ //query = query.OrderBy(p => p.RuleStationID + p.RuleSeq);
+ query = query.OrderBy(p => p.RuleSeq);
var qdata = await query.ToListAsync();
int[] list = new int[qdata.Count];
@@ -92,7 +93,8 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
IQueryable<Rules> q = _context.Ruleses;
//q = q.Where(p => list.Contains(p.RuleStationID) && status1.Contains(p.RuleStatus));
q = q.Where(p => list.Contains(p.RuleStationID));
- q = q.OrderBy(o => o.RuleStationID + o.RuleSeq);
+ //q = q.OrderBy(o => o.RuleStationID + o.RuleSeq);
+ q = q.OrderBy(o => o.RuleSeq);
var rules = await q.ToListAsync();