diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index 423ef685..693461b9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@ public class SysDept extends BaseEntity
private String deptName;
/** 显示顺序 */
- private String orderNum;
+ private Integer orderNum;
/** 负责人 */
private String leader;
@@ -96,13 +97,13 @@ public class SysDept extends BaseEntity
this.deptName = deptName;
}
- @NotBlank(message = "显示顺序不能为空")
- public String getOrderNum()
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getOrderNum()
{
return orderNum;
}
- public void setOrderNum(String orderNum)
+ public void setOrderNum(Integer orderNum)
{
this.orderNum = orderNum;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 44bd8689..984f89cc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
parent_id,
dept_name,
ancestors,
- order_num,
+ order_num,
leader,
phone,
email,
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{parentId},
#{deptName},
#{ancestors},
- #{orderNum},
+ #{orderNum},
#{leader},
#{phone},
#{email},
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
parent_id = #{parentId},
dept_name = #{deptName},
ancestors = #{ancestors},
- order_num = #{orderNum},
+ order_num = #{orderNum},
leader = #{leader},
phone = #{phone},
email = #{email},
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 81e7b705..f11402c7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -130,7 +130,7 @@
menu_name = #{menuName},
parent_id = #{parentId},
- order_num = #{orderNum},
+ order_num = #{orderNum},
path = #{path},
component = #{component},
`query` = #{query},
@@ -153,7 +153,7 @@
menu_id,
parent_id,
menu_name,
- order_num,
+ order_num,
path,
component,
`query`,
@@ -171,7 +171,7 @@
#{menuId},
#{parentId},
#{menuName},
- #{orderNum},
+ #{orderNum},
#{path},
#{component},
#{query},