From 2c2a39c341c1a064cbf1037199598fa8f37ec9f2 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Wed, 13 May 2026 09:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E7=A4=BE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mappers/ex/LevelMapperExt.xml   | 14 +++++++++++---
 .../dashboard/back/dto/level/LevelEntity.java      |  5 +++++
 .../dashboard/back/dto/level/OptLevelParam.java    |  6 ++++++
 .../dashboard/back/vo/level/LevelPageDTO.java      |  6 ++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml
index 6772f7d..268e080 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml
@@ -44,7 +44,10 @@
     <insert id="saveLevel" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
         INSERT INTO
         <include refid="selectTable" />
-        (company_id, name, `code`, remark, created_by, created_at)
+        (company_id, name, `code`, remark,
+            <if test="sortOrder != null">sort_order,</if>
+            created_by, created_at
+        )
         VALUES
         (
         #{companyId},
@@ -57,6 +60,7 @@
             <when test="remark != null and remark != ''">#{remark}</when>
             <otherwise>NULL</otherwise>
         </choose>,
+        <if test="sortOrder != null">#{sortOrder},</if>
         #{createdBy},
         #{createdAt}
         )
@@ -83,6 +87,9 @@
             name = #{name},
             `code` = #{code},
             remark = #{remark},
+            <if test="sortOrder != null">
+                sort_order = #{sortOrder},
+            </if>
             updated_at = #{updatedAt},
             updated_by = #{updatedBy}
         WHERE id = #{id}
@@ -116,6 +123,7 @@
         base.`name` AS levelName,
         base.`code` AS levelCode,
         base.remark,
+        base.sort_order,
         base.created_by,
         base.created_at,
         base.updated_by,
@@ -182,7 +190,7 @@
                 GROUP BY base.`id`
             </when>
         </choose>
-        order BY base.`id` desc
+        order BY base.sort_order desc, base.`id` desc
     </select>
 
     <select id="getBoundBuilding" resultType="java.lang.Long">
@@ -313,7 +321,7 @@
                 AND b.building_id IN <foreach collection="bindBuildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
             </if>
         </where>
-        order by br.id
+        order by br.sort_order desc, br.id desc
     </select>
 
     <delete id="deleteSiteBuildingRelation">
diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/LevelEntity.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/LevelEntity.java
index dc2fc73..fe6d42c 100644
--- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/LevelEntity.java
+++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/LevelEntity.java
@@ -33,6 +33,11 @@ public class LevelEntity {
      */
     private String remark;
 
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
     /**
      * 编码
      */
diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/OptLevelParam.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/OptLevelParam.java
index 78103b5..f79c72f 100644
--- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/OptLevelParam.java
+++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/level/OptLevelParam.java
@@ -54,6 +54,12 @@ public class OptLevelParam {
     @Schema(description = "编码",example = "2cc")
     private String code;
 
+    /**
+     * 排序序号
+     */
+    @Schema(description = "排序序号",example = "1", required = false)
+    private Integer sortOrder;
+
 
     @Schema(description = "所属企业ID",example = "2", hidden = true)
     private Long companyId;
diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/level/LevelPageDTO.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/level/LevelPageDTO.java
index 6a87423..02eda9c 100644
--- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/level/LevelPageDTO.java
+++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/level/LevelPageDTO.java
@@ -56,6 +56,12 @@ public class LevelPageDTO {
     @Schema(description = "备注",example = "2")
     private String remark;
 
+    /**
+     * 排序序号
+     */
+    @Schema(description = "排序序号",example = "1")
+    private Integer sortOrder;
+
 
     @Schema(description = "创建时间，毫秒级时间戳",example = "2")
     private Long createdAt;