feat(menu): 添加菜单排序功能

- 在HwWebMenu实体类中新增order字段及对应的getter/setter方法
- 更新数据库映射文件中的resultMap，添加order字段映射
- 在查询SQL中增加order字段的查询条件和排序规则
- 在插入和更新操作中添加对order字段的处理
- 修复了XML文件格式化问题

ruoyi-portal/src/main/java/com/ruoyi/portal/domain/HwWebMenu.java

@@ -5,8 +5,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.TreeEntity;
 
-import java.util.List;
-
 /**
  * haiwei官网菜单对象 hw_web_menu
  *
@@ -44,6 +42,10 @@ public class HwWebMenu extends TreeEntity
     @Excel(name = "官网菜单类型")
     private Long webMenuType;
 
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer order;
+
     /** 逻辑删除标志：'0'未删除，'1'已删除 */
     private String isDelete;
 
@@ -113,6 +115,14 @@ public class HwWebMenu extends TreeEntity
         return webMenuType;
     }
 
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
     public String getIsDelete() {
         return isDelete;
     }
@@ -140,6 +150,7 @@ public class HwWebMenu extends TreeEntity
                 .append("tenantId", getTenantId())
                 .append("webMenuPic", getWebMenuPic())
                 .append("webMenuType", getWebMenuType())
+                .append("order", getOrder())
                 .append("isDelete", getIsDelete())
                 .append("webMenuNameEnglish", getWebMenuNameEnglish())
                 .toString();

ruoyi-portal/src/main/resources/mapper/portal/HwWebMenuMapper.xml

@@ -13,12 +13,14 @@
         <result property="tenantId"    column="tenant_id"    />
         <result property="webMenuPic"    column="web_menu__pic"    />
         <result property="webMenuType"    column="web_menu_type"    />
+        <result property="order"    column="order"    />
         <result property="isDelete" column="is_delete" />
         <result property="webMenuNameEnglish" column="web_menu_name_english" />
     </resultMap>
 
     <sql id="selectHwWebMenuVo">
         select web_menu_id, parent, ancestors, status, web_menu_name, tenant_id, web_menu__pic, web_menu_type,
+               order,
                web_menu_name_english,
         is_delete 
         from hw_web_menu
@@ -35,8 +37,10 @@
             <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
             <if test="webMenuPic != null  and webMenuPic != ''"> and web_menu__pic = #{webMenuPic}</if>
             <if test="webMenuType != null "> and web_menu_type = #{webMenuType}</if>
+            <if test="order != null "> and `order` = #{order}</if>
              <if test="webMenuNameEnglish != null  and webMenuNameEnglish != ''"> and web_menu_name_english = #{webMenuNameEnglish}</if>
         </where>
+        order by parent, order asc, web_menu_id asc
     </select>
 
     <select id="selectHwWebMenuByWebMenuId" parameterType="Long" resultMap="HwWebMenuResult">
@@ -55,6 +59,7 @@
             <if test="tenantId != null">tenant_id,</if>
             <if test="webMenuPic != null">web_menu__pic,</if>
             <if test="webMenuType != null">web_menu_type,</if>
+            <if test="order != null">`order`,</if>
             <if test="webMenuNameEnglish != null">web_menu_name_english,</if>
             is_delete,
         </trim>
@@ -67,6 +72,7 @@
             <if test="tenantId != null">#{tenantId},</if>
             <if test="webMenuPic != null">#{webMenuPic},</if>
             <if test="webMenuType != null">#{webMenuType},</if>
+            <if test="order != null">#{order},</if>
             <if test="webMenuNameEnglish != null">#{webMenuNameEnglish},</if>
             <choose>
                 <when test="isDelete != null and isDelete != ''">#{isDelete},</when>
@@ -85,6 +91,7 @@
             <if test="tenantId != null">tenant_id = #{tenantId},</if>
             <if test="webMenuPic != null">web_menu__pic = #{webMenuPic},</if>
             <if test="webMenuType != null">web_menu_type = #{webMenuType},</if>
+            <if test="order != null">`order` = #{order},</if>
             <if test="webMenuNameEnglish != null">web_menu_name_english = #{webMenuNameEnglish},</if>
         </trim>
         where web_menu_id = #{webMenuId}
@@ -100,4 +107,4 @@
             #{webMenuId}
         </foreach>
     </update>
-</mapper>
+</mapper>