diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs index e886b68b..21a51d96 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs @@ -73,7 +73,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS CurrStationId = q2.StationID, NextStationId = q3.StationID }; - query.OrderBy(p => p.RuleStationID + p.RuleSeq); + query = query.OrderBy(p => p.RuleStationID + p.RuleSeq); var qdata = await query.ToListAsync(); int[] list = new int[qdata.Count]; @@ -92,7 +92,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS IQueryable 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.RuleSeq); + q = q.OrderBy(o => o.RuleStationID + o.RuleSeq); var rules = await q.ToListAsync(); @@ -100,7 +100,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS { //rules[j].CurrStation = _context.Stationses.Where(p1 => p1.StationID.Equals(list1[j])).FirstOrDefault(); rules[j].RuleDesc = _context.Stationses.Where(p1 => p1.StationID.Equals(list1[j])).FirstOrDefault().StationName; - rules[j].NextStation = _context.Stationses.Where(p1 => p1.StationID.Equals(list2[j])).FirstOrDefault(); + rules[j].NextStation = _context.Stationses.Where(p2 => p2.StationID.Equals(list2[j])).FirstOrDefault(); } if (rules == null)