From 32c65247b2930a195573438a7f43f59d933fdbe8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 13 四月 2021 08:40:04 +0800
Subject: [PATCH] 优化主子表代码生成模板
---
src/main/resources/application-druid.yml | 2 +-
src/main/resources/vm/xml/mapper.xml.vm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml
index 423e75f..1f098e4 100644
--- a/src/main/resources/application-druid.yml
+++ b/src/main/resources/application-druid.yml
@@ -43,7 +43,7 @@
allow:
url-pattern: /druid/*
# 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: admin
+ login-username: ruoyi
login-password: 123456
filter:
stat:
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
index 93963ea..6d0954e 100644
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ b/src/main/resources/vm/xml/mapper.xml.vm
@@ -12,12 +12,12 @@
#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" />
+ <collection property="${subclassName}List" notNullColumn="sub_${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="sub_${column.columnName}" />
#end
</resultMap>
#end
@@ -64,7 +64,7 @@
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#if($velocityCount != $subTable.columns.size()),#end#end
+ #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
from ${tableName} a
left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
--
Gitblit v1.9.3