From 9db6c7495a5639604783c86c77e6f315cfac9c3d Mon Sep 17 00:00:00 2001
From: wayn <1669738430@qq.com>
Date: Sun, 31 May 2020 15:49:11 +0800
Subject: [PATCH] =?UTF-8?q?perf(pom):=20=E7=BB=9F=E4=B8=80=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wayn/project/system/domain/SysDept.java    |  2 +-
 .../wayn/project/system/domain/SysMenu.java    |  2 +-
 .../wayn/project/system/domain/SysRole.java    |  2 +-
 .../resources/mapper/system/DeptMapper.xml     |  8 ++++----
 .../resources/mapper/system/MenuMapper.xml     | 18 +++++++++---------
 .../resources/mapper/system/RoleMapper.xml     |  4 ++--
 .../resources/mapper/system/UserMapper.xml     |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/wayn/project/system/domain/SysDept.java b/src/main/java/com/wayn/project/system/domain/SysDept.java
index 58d290f..ce950c5 100644
--- a/src/main/java/com/wayn/project/system/domain/SysDept.java
+++ b/src/main/java/com/wayn/project/system/domain/SysDept.java
@@ -50,7 +50,7 @@ public class SysDept extends BaseEntity {
      * 显示顺序
      */
     @DecimalMin(value = "0", message = "显示顺序不能小于0")
-    private String orderNum;
+    private Integer sort;
 
     /**
      * 负责人
diff --git a/src/main/java/com/wayn/project/system/domain/SysMenu.java b/src/main/java/com/wayn/project/system/domain/SysMenu.java
index 43da468..17f5de9 100644
--- a/src/main/java/com/wayn/project/system/domain/SysMenu.java
+++ b/src/main/java/com/wayn/project/system/domain/SysMenu.java
@@ -44,7 +44,7 @@ public class SysMenu extends BaseEntity {
      * 显示顺序
      */
     @DecimalMin(value = "0", message = "显示顺序不能小于0")
-    private Integer orderNum;
+    private Integer sort;
 
     /**
      * 路由地址
diff --git a/src/main/java/com/wayn/project/system/domain/SysRole.java b/src/main/java/com/wayn/project/system/domain/SysRole.java
index 3e2559f..41e8ef0 100644
--- a/src/main/java/com/wayn/project/system/domain/SysRole.java
+++ b/src/main/java/com/wayn/project/system/domain/SysRole.java
@@ -48,7 +48,7 @@ public class SysRole extends BaseEntity {
      */
     @DecimalMin(value = "0", message = "角色排序不能小于0")
     @Excel(name = "角色排序", type = 10)
-    private Integer roleSort;
+    private Integer sort;
 
     /**
      * 角色状态（0正常 1停用）
diff --git a/src/main/resources/mapper/system/DeptMapper.xml b/src/main/resources/mapper/system/DeptMapper.xml
index d9e885b..55351b3 100644
--- a/src/main/resources/mapper/system/DeptMapper.xml
+++ b/src/main/resources/mapper/system/DeptMapper.xml
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
-		<result property="orderNum"   column="order_num"   />
+		<result property="sort"       column="sort"        />
 		<result property="leader"     column="leader"      />
 		<result property="phone"      column="phone"       />
 		<result property="email"      column="email"       />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.dept_status, d.del_flag, d.create_by,
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.sort, d.leader, d.phone, d.email, d.dept_status, d.del_flag, d.create_by,
         d.create_time, d.remark
         from sys_dept d
     </sql>
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptStatus != null">
 			AND dept_status = #{deptStatus}
 		</if>
-		order by d.parent_id, d.order_num
+		order by d.parent_id, d.sort
     </select>
     
     <select id="selectDeptListByRoleId" parameterType="Long" resultType="Integer">
@@ -49,6 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
         	and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
-		order by d.parent_id, d.order_num
+		order by d.parent_id, d.sort
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/system/MenuMapper.xml b/src/main/resources/mapper/system/MenuMapper.xml
index 50afa67..8da6726 100644
--- a/src/main/resources/mapper/system/MenuMapper.xml
+++ b/src/main/resources/mapper/system/MenuMapper.xml
@@ -8,7 +8,7 @@
 		<id     property="menuId"         column="menu_id"        />
 		<result property="menuName"       column="menu_name"      />
 		<result property="parentId"       column="parent_id"      />
-		<result property="orderNum"       column="order_num"      />
+		<result property="sort"           column="sort"      	  />
 		<result property="path"           column="path"           />
 		<result property="component"      column="component"      />
 		<result property="isFrame"        column="is_frame"       />
@@ -22,7 +22,7 @@
 	</resultMap>
 
     <sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, is_frame, menu_type, menu_status, visible, ifnull(perms,'') as perms, icon, create_time
+        select menu_id, menu_name, parent_id, sort, path, component, is_frame, menu_type, menu_status, visible, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu m
     </sql>
 
@@ -34,24 +34,24 @@
 			</if>
             <if test="menuStatus != null">and m.menu_status = #{menuStatus}</if>
         </where>
-		order by m.parent_id, m.order_num
+		order by m.parent_id, m.sort
     </select>
 
     <select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.menu_status, m.visible, ifnull(m.perms,'') as perms, m.visible, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.menu_status, m.visible, ifnull(m.perms,'') as perms, m.visible, m.is_frame, m.menu_type, m.icon, m.sort, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.menu_status = 0
-		order by m.parent_id, m.order_num
+		order by m.parent_id, m.sort
 	</select>
 
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.menu_status, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.menu_status, m.visible, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.sort, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 			 left join sys_role ro on ur.role_id = ro.role_id
 			 left join sys_user u on ur.user_id = u.user_id
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.menu_status = 0  AND ro.role_status = 0
-		order by m.parent_id, m.order_num
+		order by m.parent_id, m.sort
 	</select>
 
     <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
@@ -64,7 +64,7 @@
 	</select>
 
     <select id="selectMenuListByUserId" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.menu_status, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.menu_status, ifnull(m.perms,'') as perms, m.is_frame, m.menu_type, m.icon, m.sort, m.create_time
 		from sys_menu m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
@@ -76,6 +76,6 @@
 			</if>
 			<if test="menu.menuStatus != null">and menu_status = #{menu.menuStatus}</if>
 		</where>
-		order by m.parent_id, m.order_num
+		order by m.parent_id, m.sort
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/system/RoleMapper.xml b/src/main/resources/mapper/system/RoleMapper.xml
index 833cd38..500a38f 100644
--- a/src/main/resources/mapper/system/RoleMapper.xml
+++ b/src/main/resources/mapper/system/RoleMapper.xml
@@ -8,7 +8,7 @@
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
         <result property="roleKey"      column="role_key"       />
-        <result property="roleSort"     column="role_sort"      />
+        <result property="sort"         column="sort"           />
         <result property="roleStatus"   column="role_status"    />
         <result property="delFlag"      column="del_flag"       />
         <result property="createTime"   column="create_time"    />
@@ -16,7 +16,7 @@
     </resultMap>
 
     <sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort,
+	    select distinct r.role_id, r.role_name, r.role_key, r.sort,
             r.role_status, r.del_flag, r.create_time, r.remark
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml
index eba2d98..5cbdc01 100644
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
@@ -28,14 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<id     property="deptId"       column="dept_id"     />
 		<result property="parentId" 	column="parent_id"   />
 		<result property="deptName" 	column="dept_name"   />
-		<result property="orderNum" 	column="order_num"   />
+		<result property="sort" 	    column="sort"        />
 		<result property="leader"   	column="leader"      />
 		<result property="deptStatus"   column="dept_status" />
 	</resultMap>
 	
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone, u.password, u.sex, u.user_status, u.del_flag, u.create_by, u.create_time, u.remark,
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.dept_status
+        d.dept_id, d.parent_id, d.dept_name, d.sort, d.leader, d.dept_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
     </sql>