From 2a604c0548f5b45a00d56298e0c60d09e071e88b Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期三, 02 六月 2021 20:40:09 +0800 Subject: [PATCH] !237 同步菜单新增、修改界面“功能权限”maxlength为100(保持与数据库字段长度一致),避免因超过50后不能录入问题 Merge pull request !237 from 老李/origin --- ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 6 +++--- 1 files changed, 3 insertions(+), 3 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 93963ea..6d0954e 100644 --- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/ruoyi-generator/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.2