Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
多鱼的夏天
RuoYi-Cloud-Docker
提交
6bc77169
R
RuoYi-Cloud-Docker
项目概览
多鱼的夏天
/
RuoYi-Cloud-Docker
通知
209
Star
7
Fork
6
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Cloud-Docker
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
6bc77169
编写于
4月 25, 2022
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改显示顺序orderNum类型为整型
上级
742f3106
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
10 deletion
+11
-10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
...em/src/main/java/com/ruoyi/system/api/domain/SysDept.java
+5
-4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
...system/src/main/resources/mapper/system/SysDeptMapper.xml
+3
-3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
...system/src/main/resources/mapper/system/SysMenuMapper.xml
+3
-3
未找到文件。
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
浏览文件 @
6bc77169
...
@@ -4,6 +4,7 @@ import java.util.ArrayList;
...
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
javax.validation.constraints.Email
;
import
javax.validation.constraints.Email
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
...
@@ -31,7 +32,7 @@ public class SysDept extends BaseEntity
...
@@ -31,7 +32,7 @@ public class SysDept extends BaseEntity
private
String
deptName
;
private
String
deptName
;
/** 显示顺序 */
/** 显示顺序 */
private
String
orderNum
;
private
Integer
orderNum
;
/** 负责人 */
/** 负责人 */
private
String
leader
;
private
String
leader
;
...
@@ -96,13 +97,13 @@ public class SysDept extends BaseEntity
...
@@ -96,13 +97,13 @@ public class SysDept extends BaseEntity
this
.
deptName
=
deptName
;
this
.
deptName
=
deptName
;
}
}
@Not
Blank
(
message
=
"显示顺序不能为空"
)
@Not
Null
(
message
=
"显示顺序不能为空"
)
public
String
getOrderNum
()
public
Integer
getOrderNum
()
{
{
return
orderNum
;
return
orderNum
;
}
}
public
void
setOrderNum
(
String
orderNum
)
public
void
setOrderNum
(
Integer
orderNum
)
{
{
this
.
orderNum
=
orderNum
;
this
.
orderNum
=
orderNum
;
}
}
...
...
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
浏览文件 @
6bc77169
...
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"parentId != null and parentId != 0"
>
parent_id,
</if>
<if
test=
"parentId != null and parentId != 0"
>
parent_id,
</if>
<if
test=
"deptName != null and deptName != ''"
>
dept_name,
</if>
<if
test=
"deptName != null and deptName != ''"
>
dept_name,
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
ancestors,
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
ancestors,
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
order_num,
</if>
<if
test=
"orderNum != null"
>
order_num,
</if>
<if
test=
"leader != null and leader != ''"
>
leader,
</if>
<if
test=
"leader != null and leader != ''"
>
leader,
</if>
<if
test=
"phone != null and phone != ''"
>
phone,
</if>
<if
test=
"phone != null and phone != ''"
>
phone,
</if>
<if
test=
"email != null and email != ''"
>
email,
</if>
<if
test=
"email != null and email != ''"
>
email,
</if>
...
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"parentId != null and parentId != 0"
>
#{parentId},
</if>
<if
test=
"parentId != null and parentId != 0"
>
#{parentId},
</if>
<if
test=
"deptName != null and deptName != ''"
>
#{deptName},
</if>
<if
test=
"deptName != null and deptName != ''"
>
#{deptName},
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
#{ancestors},
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
#{ancestors},
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
#{orderNum},
</if>
<if
test=
"orderNum != null"
>
#{orderNum},
</if>
<if
test=
"leader != null and leader != ''"
>
#{leader},
</if>
<if
test=
"leader != null and leader != ''"
>
#{leader},
</if>
<if
test=
"phone != null and phone != ''"
>
#{phone},
</if>
<if
test=
"phone != null and phone != ''"
>
#{phone},
</if>
<if
test=
"email != null and email != ''"
>
#{email},
</if>
<if
test=
"email != null and email != ''"
>
#{email},
</if>
...
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"parentId != null and parentId != 0"
>
parent_id = #{parentId},
</if>
<if
test=
"parentId != null and parentId != 0"
>
parent_id = #{parentId},
</if>
<if
test=
"deptName != null and deptName != ''"
>
dept_name = #{deptName},
</if>
<if
test=
"deptName != null and deptName != ''"
>
dept_name = #{deptName},
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
ancestors = #{ancestors},
</if>
<if
test=
"ancestors != null and ancestors != ''"
>
ancestors = #{ancestors},
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
order_num = #{orderNum},
</if>
<if
test=
"orderNum != null"
>
order_num = #{orderNum},
</if>
<if
test=
"leader != null"
>
leader = #{leader},
</if>
<if
test=
"leader != null"
>
leader = #{leader},
</if>
<if
test=
"phone != null"
>
phone = #{phone},
</if>
<if
test=
"phone != null"
>
phone = #{phone},
</if>
<if
test=
"email != null"
>
email = #{email},
</if>
<if
test=
"email != null"
>
email = #{email},
</if>
...
...
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
浏览文件 @
6bc77169
...
@@ -130,7 +130,7 @@
...
@@ -130,7 +130,7 @@
<set>
<set>
<if
test=
"menuName != null and menuName != ''"
>
menu_name = #{menuName},
</if>
<if
test=
"menuName != null and menuName != ''"
>
menu_name = #{menuName},
</if>
<if
test=
"parentId != null"
>
parent_id = #{parentId},
</if>
<if
test=
"parentId != null"
>
parent_id = #{parentId},
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
order_num = #{orderNum},
</if>
<if
test=
"orderNum != null"
>
order_num = #{orderNum},
</if>
<if
test=
"path != null and path != ''"
>
path = #{path},
</if>
<if
test=
"path != null and path != ''"
>
path = #{path},
</if>
<if
test=
"component != null"
>
component = #{component},
</if>
<if
test=
"component != null"
>
component = #{component},
</if>
<if
test=
"query != null"
>
`query` = #{query},
</if>
<if
test=
"query != null"
>
`query` = #{query},
</if>
...
@@ -153,7 +153,7 @@
...
@@ -153,7 +153,7 @@
<if
test=
"menuId != null and menuId != 0"
>
menu_id,
</if>
<if
test=
"menuId != null and menuId != 0"
>
menu_id,
</if>
<if
test=
"parentId != null and parentId != 0"
>
parent_id,
</if>
<if
test=
"parentId != null and parentId != 0"
>
parent_id,
</if>
<if
test=
"menuName != null and menuName != ''"
>
menu_name,
</if>
<if
test=
"menuName != null and menuName != ''"
>
menu_name,
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
order_num,
</if>
<if
test=
"orderNum != null"
>
order_num,
</if>
<if
test=
"path != null and path != ''"
>
path,
</if>
<if
test=
"path != null and path != ''"
>
path,
</if>
<if
test=
"component != null and component != ''"
>
component,
</if>
<if
test=
"component != null and component != ''"
>
component,
</if>
<if
test=
"query != null and query != ''"
>
`query`,
</if>
<if
test=
"query != null and query != ''"
>
`query`,
</if>
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
<if
test=
"menuId != null and menuId != 0"
>
#{menuId},
</if>
<if
test=
"menuId != null and menuId != 0"
>
#{menuId},
</if>
<if
test=
"parentId != null and parentId != 0"
>
#{parentId},
</if>
<if
test=
"parentId != null and parentId != 0"
>
#{parentId},
</if>
<if
test=
"menuName != null and menuName != ''"
>
#{menuName},
</if>
<if
test=
"menuName != null and menuName != ''"
>
#{menuName},
</if>
<if
test=
"orderNum != null
and orderNum != ''
"
>
#{orderNum},
</if>
<if
test=
"orderNum != null"
>
#{orderNum},
</if>
<if
test=
"path != null and path != ''"
>
#{path},
</if>
<if
test=
"path != null and path != ''"
>
#{path},
</if>
<if
test=
"component != null and component != ''"
>
#{component},
</if>
<if
test=
"component != null and component != ''"
>
#{component},
</if>
<if
test=
"query != null and query != ''"
>
#{query},
</if>
<if
test=
"query != null and query != ''"
>
#{query},
</if>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录