From b2ff9eb6e7b23ec5c28344ad01ea24c3011386c1 Mon Sep 17 00:00:00 2001
From: kingstudio <ylwang@cafuc.edu.cn>
Date: Thu, 26 Aug 2021 23:12:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9resultMap=20=E4=B8=8E=20p?=
=?UTF-8?q?ageHelper=E4=B8=8D=E5=85=BC=E5=AE=B9=E5=AF=BC=E8=87=B4=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E6=9D=A1=E7=9B=AE=E6=80=BB=E6=95=B0=E4=B8=8E=E5=AE=9E?=
=?UTF-8?q?=E9=99=85=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 0c681d9cd..82b4e333c 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -12,9 +12,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#if($table.sub)
<resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
+ <collection property="${subclassName}List" ofType="${subClassName}" column="${subTable.pkColumn.columnName}" select="get${subClassName}List" />
</resultMap>
+ <select id="get${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
+ select#foreach ($column in $subTable.columns) $column.columnName AS sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
+ from ${subTableName}
+ where sub_${subTable.pkColumn.columnName} = #{${subTable.pkColumn.columnName}}
+ </select>
+
<resultMap type="${subClassName}" id="${subClassName}Result">
#foreach ($column in $subTable.columns)
<result property="${column.javaField}" column="sub_${column.columnName}" />
From 6208d0489b8bea4e5c947c4ac663f02f93423001 Mon Sep 17 00:00:00 2001
From: kingstudio <ylwang@cafuc.edu.cn>
Date: Fri, 27 Aug 2021 00:14:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9resultMap=20=E4=B8=8E=20p?=
=?UTF-8?q?ageHelper=E4=B8=8D=E5=85=BC=E5=AE=B9=E5=AF=BC=E8=87=B4=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E6=9D=A1=E7=9B=AE=E6=80=BB=E6=95=B0=E4=B8=8E=E5=AE=9E?=
=?UTF-8?q?=E9=99=85=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 9 +++------
1 file changed, 3 insertions(+), 6 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 82b4e333c..b42e0bbde 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -12,13 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#if($table.sub)
<resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" ofType="${subClassName}" column="${subTable.pkColumn.columnName}" select="get${subClassName}List" />
+ <collection property="${subclassName}List" ofType="${subClassName}" column="${subTableFkName}" select="get${subClassName}List" />
</resultMap>
<select id="get${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
select#foreach ($column in $subTable.columns) $column.columnName AS sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
from ${subTableName}
- where sub_${subTable.pkColumn.columnName} = #{${subTable.pkColumn.columnName}}
+ where ${subTableFkName} = #{${subTableFkName}}
</select>
<resultMap type="${subClassName}" id="${subClassName}Result">
@@ -69,11 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="select${ClassName}Vo"/>
where ${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 as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
-
+ select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end
from ${tableName} a
- left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
#end
</select>