diff --git a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index c9c9e0f..b520fdf 100644 --- a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -113,6 +113,10 @@ public class GenTableColumn extends BaseEntity return subColumnFkName; } + public String getSubColumnFkJavaField(){ + return StringUtils.toCamelCase(this.subColumnFkName); + } + public void setSubColumnFkName(String subColumnFkName) { this.subColumnFkName = subColumnFkName; } diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index 80a94de..6c7a904 100644 --- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -621,7 +621,7 @@ function remoteMethod${JavaField}(query){ loading${JavaField}.value = true list目标业务名({${column.subColumnJavaField}:query}).then(res=>{ loading${JavaField}.value = false - options${JavaField}.value = res.rows.map(item=>({label:item.${column.subColumnJavaField},value:item.${column.subColumnFkName}})) + options${JavaField}.value = res.rows.map(item=>({label:item.${column.subColumnJavaField},value:item.${column.getSubColumnFkJavaField()}})) }) } else { options${JavaField}.value = [] diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm index 6cc85f5..ee84626 100644 --- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -24,10 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #if($table.haveSubColumn=="1") - select#foreach($column in $columns) #if($column.subColumnTableName)${column.subColumnTableName}.${column.subColumnName},#end${tableName}.${column.columnName}#if($foreach.count != $columns.size()),#end#end from ${tableName} + select#foreach($column in $columns) #if($column.subColumnTableName)${column.subColumnTableName}.${column.subColumnName},#end${businessName}.${column.columnName}#if($foreach.count != $columns.size()),#end#end from ${tableName} as ${businessName} #foreach($column in $columns) #if($column.subColumnTableName) - left join ${column.subColumnTableName} on ${column.subColumnTableName}.${column.subColumnFkName}=${tableName}.${column.columnName} + left join ${column.subColumnTableName} on ${column.subColumnTableName}.${column.subColumnFkName}=${businessName}.${column.columnName} #end #end #else