From 17c4b61857a61ec19e44838440dfc6bf878c28ae Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 8 Jan 2020 21:09:16 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E6=A0=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/springblade/system/mapper/DeptMapper.xml | 3 +++
 .../src/main/java/org/springblade/system/mapper/MenuMapper.xml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index 49a548f8..f751102f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
@@ -69,6 +69,7 @@
         <if test="param.fullName!=null and param.fullName!=''">
             and dept.full_name like concat('%', #{param.fullName},'%')
         </if>
+        ORDER BY dept.sort
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
@@ -76,6 +77,7 @@
         <if test="_parameter!=null and _parameter!=''">
             and tenant_id = #{_parameter}
         </if>
+        ORDER BY sort
     </select>
 
     <select id="lazyTree" resultMap="treeNodeResultMap" >
@@ -100,6 +102,7 @@
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>
+        ORDER BY dept.sort
     </select>
 
     <select id="getDeptNames" resultType="java.lang.String">
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index 207ff181..c1e12a59 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -70,6 +70,7 @@
         <if test="param.alias!=null and param.alias!=''">
             and menu.alias like concat('%', #{param.alias},'%')
         </if>
+        ORDER BY menu.sort
     </select>
 
     <select id="lazyMenuList" resultMap="menuVOResultMap">
@@ -98,6 +99,7 @@
         <if test="param.alias!=null and param.alias!=''">
             and menu.alias like concat('%', #{param.alias},'%')
         </if>
+        ORDER BY menu.sort
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">