diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 77a54914..3798c2f8 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -75,6 +75,10 @@ public class VelocityUtils { context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); } + if (paramsObj.containsKey(GenConstants.TREE_NAME)) + { + context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); + } } /** diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm index 750b254b..33280696 100644 --- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/add.html.vm @@ -28,10 +28,9 @@
#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) -#set($deptId = "${className}?.deptId") -#set($deptName = "${className}?.deptName") - - +#set($treeId = "${className}?.${treeCode}") + +
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm index ebd155e7..06904228 100644 --- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm @@ -29,8 +29,6 @@
#set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)}) -#set($deptId = "${className}?.deptId") -#set($deptName = "${className}?.deptName") diff --git a/ruoyi-generator/src/main/resources/vm/html/tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/tree.html.vm index 2f13934a..91e8fab3 100644 --- a/ruoyi-generator/src/main/resources/vm/html/tree.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/tree.html.vm @@ -31,7 +31,7 @@