From dfffb90c15a0c3f50562ff9235f3fdb286675a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Sat, 22 Nov 2025 17:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs   | 2 +-
 APT.MicroApi/APT.FO.WebApi/Controllers/FireJobWbController.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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_FO_FIRE_JOB_DETAIL>(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_FO_FIRE_JOB_WB_DETAIL>(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;
             });