From cfe544781143949cba8f1708a6f64d78148f7882 Mon Sep 17 00:00:00 2001
From: dawn9117 <silanglang@163.com>
Date: Mon, 21 Dec 2020 14:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6,=20=E4=B8=BB=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=90=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=95=B0=E6=8D=AE=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/xml/mapper.xml.vm         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 1b918e214..51302a795 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -14,13 +14,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 #if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
-        <collection property="${subclassName}List" notNullColumn="${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}">
+    #foreach ($column in $columns)
+        <result property="${column.javaField}"    column="a_${column.columnName}"    />
+    #end
+        <collection property="${subclassName}List" notNullColumn="b_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
     </resultMap>
 
     <resultMap type="${subClassName}" id="${subClassName}Result">
 #foreach ($column in $subTable.columns)
-        <result property="${column.javaField}"    column="${column.columnName}"    />
+        <result property="${column.javaField}"    column="b_${column.columnName}"    />
 #end
     </resultMap>
 #end
@@ -74,8 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ${tableName} p on p.${pkColumn.columnName} = t.${tree_parent_code}
         where t.${pkColumn.columnName} = #{${pkColumn.javaField}}
 #elseif($table.sub)
-        select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end,
-           #foreach($column in $subTable.columns) b.$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
+        select#foreach($column in $columns) a.$column.columnName as a_$column.columnName#if($velocityCount != $columns.size()),#end#end,
+           #foreach($column in $subTable.columns) b.$column.columnName as b_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
 
         from ${tableName} a
         left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}