github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Constants部分常量添加final修饰

pull/85/head
RuoYi 2019-04-12 19:10:52 +08:00
parent 5d84c7fcb0
commit 2ad741c4e8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -48,7 +48,7 @@ public class CommonController
{
if (!FileUtils.isValidFilename(fileName))
{
throw new Exception(StringUtils.format(" 文件名称({})非法，不允许下载。 ", fileName));
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
String filePath = Global.getDownloadPath() + fileName;

1
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -1085,7 +1085,6 @@
notAllowLastLevel: function(_tree) {
var nodes = _tree.getSelectedNodes();
for (var i = 0; i < nodes.length; i++) {
//if (nodes[i].level == nodes.length + 1)判断是否是最后层级节点该条件判定四级组织结构时失效，如下只需判定选择的节点：isParent == false即可 modify by weidu 2019-04-10
if (!nodes[i].isParent) {
$.modal.msgError("不能选择最后层级节点（" + nodes[i].name + "）");
return false;

10
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -40,25 +40,25 @@ public class Constants
/**
* 自动去除表前缀
*/
public static String AUTO_REOMVE_PRE = "true";
public static final String AUTO_REOMVE_PRE = "true";
/**
* 当前记录起始索引
*/
public static String PAGE_NUM = "pageNum";
public static final String PAGE_NUM = "pageNum";
/**
* 每页显示记录数
*/
public static String PAGE_SIZE = "pageSize";
public static final String PAGE_SIZE = "pageSize";
/**
* 排序列
*/
public static String ORDER_BY_COLUMN = "orderByColumn";
public static final String ORDER_BY_COLUMN = "orderByColumn";
/**
* 排序的方向 "desc" 或者 "asc".
*/
public static String IS_ASC = "isAsc";
public static final String IS_ASC = "isAsc";
}