diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index 36734b8..977e7ec 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -54,7 +54,7 @@ namespace APT.FO.WebApi.Controllers if (entity != null) { var details = this.GetEntities(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList(); - entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ToList(); + entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList(); } return entity; }); diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs index c4844b7..8e72bcf 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs @@ -53,7 +53,7 @@ namespace APT.FO.WebApi.Controllers if (entity != null) { var details = this.GetEntities(t => t.FIRE_JOB_WB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList(); - entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ToList(); + entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m=>m.NUM).ToList(); } return entity; });