From 8c992183e30d9cfd3b533e77dc3dfd20f4129000 Mon Sep 17 00:00:00 2001
From: liweijie <liweijie@fengyingkj.top>
Date: Wed, 16 Sep 2026 09:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=A5=BC=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/roomroot/jwgl/mapper/BuildMapper.xml    | 4 ++--
 .../java/com/roomroot/jwgl/service/impl/BuildServiceImpl.java | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/BuildMapper.xml b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/BuildMapper.xml
index 9c383ec3a..0e96cd612 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/BuildMapper.xml
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/mapper/BuildMapper.xml
@@ -36,11 +36,11 @@
                 AND DEL_FLAG = #{jxlb.delFlag}
             </if>
         </where>
-        ORDER BY 序号
+        ORDER BY CASE WHEN REGEXP_LIKE(序号, '^[0-9]+$') THEN CAST(序号 AS INT) END NULLS LAST, 序号
     </select>
 
     <select id="selectMaxXh" resultType="java.lang.String">
-        SELECT MAX(序号) FROM 教学楼表 WHERE DEL_FLAG = 0
+        SELECT MAX(CAST(序号 AS INT)) FROM 教学楼表 WHERE DEL_FLAG = 0 AND REGEXP_LIKE(序号, '^[0-9]+$')
     </select>
 
 </mapper>
diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/BuildServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/BuildServiceImpl.java
index 0abd2a34f..8b799db67 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/BuildServiceImpl.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/BuildServiceImpl.java
@@ -173,7 +173,8 @@ public class BuildServiceImpl implements BuildService {
         }
         // 只返回未删除的教学楼（与 pageList 口径一致，避免已删除数据出现在下拉/全量列表里）
         wrapper.eq(JXLB::getDelFlag, 0);
-        wrapper.orderByAsc(JXLB::getXh);
+        // 序号为字符串列，按自然数排序（非数字排在最后按字典序），与 pageList 口径一致
+        wrapper.last("ORDER BY CASE WHEN REGEXP_LIKE(序号, '^[0-9]+$') THEN CAST(序号 AS INT) END NULLS LAST, 序号");
         return buildMapper.selectList(wrapper);
     }