From 7b4b354e954085407dd93a0979f883a28cc72be1 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Mon, 15 Jan 2024 04:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/v3/index.vue.vm          |  5 +++--
 .../src/main/resources/vm/xml/mapper.xml.vm            | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index f12099c..99f1b13 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -615,15 +615,16 @@ function handle${subClassName}SelectionChange(selection) {
 #set($JavaField = $column.javaField.substring(0, 1).toUpperCase() + $column.javaField.substring(1))
 /** 映射字段选中操作 */
 const loading${column.javaField} = ref(false)
+const options${JavaField} = ref([])
 function remoteMethod${JavaField}(query){
   if (query) {
       loading${JavaField}.value = true
       list目标业务名().then(res=>{
         loading${JavaField}.value = false
-        options.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.subColumnFkName}}))
       })
     } else {
-      options.value = []
+      options${JavaField}.value = []
   }
 }
 #end
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 b692254..d20b82c 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -24,7 +24,7 @@ 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}#else${tableName}.${column.columnName}#end#if($foreach.count != $columns.size()),#end#end from ${tableName}
+        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}
 #foreach($column in $columns)
 #if($column.subColumnTableName)
             left join ${column.subColumnTableName} on ${column.subColumnTableName}.${column.subColumnName}=${tableName}.${column.columnName}
@@ -76,7 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
 #if($table.crud || $table.tree)
         <include refid="select${ClassName}Vo"/>
+#if($table.haveSubColumn  == '1')
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+#else
+        where ${tableName}.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#end
 #elseif($table.sub)
         select#foreach($column in $columns) a.$column.columnName#if($foreach.count != $columns.size()),#end#end,
            #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
@@ -114,7 +118,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
 #end
         </trim>
+#if($table.haveSubColumn  == '1')
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
+#else
+        where ${tableName}.${pkColumn.columnName} = #{${pkColumn.javaField}}
+#end
     </update>
 
     <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">