From 25de488e6e2588acd3f8ec45e5ce3e19120f968a Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Wed, 13 May 2026 09:42:59 +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/db/migration/V77__branch_sort.sql |  3 +++
 .../src/main/resources/mappers/ex/LevelMapperExt.xml | 12 ++++++++++--
 .../datacenter/business/dto/level/LevelEntity.java   |  5 +++++
 .../datacenter/business/dto/level/OptLevelParam.java |  6 ++++++
 .../datacenter/business/vo/level/LevelPageDTO.java   |  6 ++++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 data-center-business-controller/src/main/resources/db/migration/V77__branch_sort.sql

diff --git a/data-center-business-controller/src/main/resources/db/migration/V77__branch_sort.sql b/data-center-business-controller/src/main/resources/db/migration/V77__branch_sort.sql
new file mode 100644
index 0000000..8916c87
--- /dev/null
+++ b/data-center-business-controller/src/main/resources/db/migration/V77__branch_sort.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `dashboard_level_branch` ADD COLUMN `sort_order` INT DEFAULT 0 COMMENT '排序顺序，数字越大越靠前' AFTER `code`;
+ALTER TABLE `dashboard_level_store_area_merge` ADD COLUMN `sort_order` INT DEFAULT 0 COMMENT '排序顺序，数字越大越靠前' AFTER `code`;
+ALTER TABLE `dashboard_level_site` ADD COLUMN `sort_order` INT DEFAULT 0 COMMENT '排序顺序，数字越大越靠前' AFTER `code`;
\ No newline at end of file
diff --git a/data-center-business-dao/src/main/resources/mappers/ex/LevelMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/LevelMapperExt.xml
index 6aa693e..7d09f64 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/LevelMapperExt.xml
+++ b/data-center-business-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>
 
 
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/LevelEntity.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/LevelEntity.java
index 5809929..3fcdd6a 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/LevelEntity.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/LevelEntity.java
@@ -33,6 +33,11 @@ public class LevelEntity {
      */
     private String remark;
 
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
     /**
      * 编码
      */
diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/OptLevelParam.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/OptLevelParam.java
index 8b3219e..d31db05 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/OptLevelParam.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/level/OptLevelParam.java
@@ -51,6 +51,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/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/level/LevelPageDTO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/level/LevelPageDTO.java
index 9fd6e98..adea895 100644
--- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/level/LevelPageDTO.java
+++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/level/LevelPageDTO.java
@@ -54,6 +54,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;