From 0e03732a6b8b934d15c48130a80a5a76cbea0d5c Mon Sep 17 00:00:00 2001
From: dftre <3066417822@qq.com>
Date: Tue, 10 Sep 2024 18:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/generator/domain/GenTableColumn.java  | 4 ++++
 .../ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm | 2 +-
 .../ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

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"
 
     <sql id="select${ClassName}Vo">
 #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