From 5def610df87c03e46e322a6989075b7d4360dfb2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 10 Aug 2019 11:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A0=91=E8=A1=A8=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/generator/util/VelocityUtils.java  | 4 ++++
 ruoyi-generator/src/main/resources/vm/html/add.html.vm     | 7 +++----
 ruoyi-generator/src/main/resources/vm/html/edit.html.vm    | 2 --
 ruoyi-generator/src/main/resources/vm/html/tree.html.vm    | 2 +-
 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

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 @@
                 <div class="col-sm-8">
                     <div class="input-group">
 #set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
-#set($deptId = "${className}?.deptId")
-#set($deptName = "${className}?.deptName")
-                        <input id="treeId" name="${treeParentCode}" type="hidden" th:value="${${deptId}}"/>
-                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:value="${${deptName}}"#if($column.required) required#end>
+#set($treeId = "${className}?.${treeCode}")
+                        <input id="treeId" name="${treeParentCode}" type="hidden" th:value="${${treeId}}"/>
+                        <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:value="${${treeName}}"#if($column.required) required#end>
                         <span class="input-group-addon"><i class="fa fa-search"></i></span>
                     </div>
                 </div>
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 @@
                 <div class="col-sm-8">
                     <div class="input-group">
 #set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
-#set($deptId = "${className}?.deptId")
-#set($deptName = "${className}?.deptName")
                         <input id="treeId" name="${treeParentCode}" type="hidden" th:field="*{${treeParentCode}}" />
                         <input class="form-control" type="text" onclick="select${BusinessName}Tree()" id="treeName" readonly="true" th:field="*{parentName}"#if($column.required) required#end>
                         <span class="input-group-addon"><i class="fa fa-search"></i></span>
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 @@
     <th:block th:include="include :: ztree-js" />
     <script th:inline="javascript">
         $(function() {
-            var url = ctx + "system/${businessName}/treeData";
+            var url = ctx + "${moduleName}/${businessName}/treeData";
             var options = {
                 url: url,
                 expandLevel: 2,
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index 264baf74..c97eddba 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="select${ClassName}Vo"/>
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
 #elseif($table.tree)
-        select#foreach($column in $columns) t.$column.columnName,#end p.dept_name as parent_name
+        select#foreach($column in $columns) t.$column.columnName,#end p.${tree_name} as parent_name
         from ${tableName} t
         left join ${tableName} p on p.${pkColumn.columnName} = t.${tree_parent_code}
         where t.${pkColumn.columnName} = #{${pkColumn.javaField}}