diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 8628f3938..817798bae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -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; diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index f9e6d211e..5d4a24589 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -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; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 9dd843c36..1a52c1f7f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -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"; }