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 82b4e333c..b42e0bbde 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -12,13 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #if($table.sub)
 
     <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
-        <collection property="${subclassName}List" ofType="${subClassName}" column="${subTable.pkColumn.columnName}" select="get${subClassName}List" />
+        <collection property="${subclassName}List" ofType="${subClassName}" column="${subTableFkName}" select="get${subClassName}List" />
     </resultMap>
 
     <select id="get${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
         select#foreach ($column in $subTable.columns) $column.columnName AS sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
         from ${subTableName}
-        where sub_${subTable.pkColumn.columnName} = #{${subTable.pkColumn.columnName}}
+        where ${subTableFkName} = #{${subTableFkName}}
     </select>
 
     <resultMap type="${subClassName}" id="${subClassName}Result">
@@ -69,11 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="select${ClassName}Vo"/>
         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 as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end
-
+        select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end
         from ${tableName} a
-        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}
         where a.${pkColumn.columnName} = #{${pkColumn.javaField}}
 #end
     </select>