update

Author: jobmission

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.revengemission.plugins</groupId>
     <artifactId>mybatis-plugins</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>MyBatis Generator plugins</description>
@@ -15,7 +15,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <HikariCP.version>6.2.1</HikariCP.version>
+        <HikariCP.version>6.3.0</HikariCP.version>
     </properties>
 
     <dependencies>

src/main/java/com/revengemission/plugins/mybatis/ForeignKeyPlugin.java

@@ -102,7 +102,6 @@ public boolean sqlMapExampleWhereClauseElementGenerated(XmlElement element, Intr
         if (selectFlag.get() && !foreignKeyItemList.isEmpty()) {
             XmlElement chooseChild = findFirstMatchedXmlElement(element, "choose");
             if (chooseChild != null) {
-                List<VisitableElement> tempList = chooseChild.getElements();
                 chooseChild.getElements().forEach(whenElement -> {
                     if (whenElement instanceof XmlElement xmlElement) {
                         for (int i = 0; i < xmlElement.getElements().size(); i++) {

src/main/java/com/revengemission/plugins/mybatis/SelectUniqueByExamplePlugin.java

@@ -59,7 +59,16 @@ public boolean sqlMapDocumentGenerated(Document document, IntrospectedTable intr
             includeBlobElement.addAttribute(new Attribute("refid", "Blob_Column_List"));
             selectElement.addElement(includeBlobElement);
 
-            selectElement.addElement(new TextElement("from " + tableName + " mt"));
+            StringBuilder stringBuilder = new StringBuilder("from " + tableName + " mt");
+            List<ForeignKeyItem> foreignKeyItemList = getForeignKeys(introspectedTable);
+            if (!foreignKeyItemList.isEmpty()) {
+                for (int i = 0; i < foreignKeyItemList.size(); i++) {
+                    stringBuilder.append("\n");
+                    stringBuilder.append("    left join ").append(foreignKeyItemList.get(i).getPkTableName()).append(" childT").append(i + 1).append(" on mt.").append(foreignKeyItemList.get(i).getFkColumnName()).append(" = childT").append(i + 1).append(".").append(foreignKeyItemList.get(i).getPkColumnName());
+                }
+            }
+            selectElement.addElement(new TextElement(stringBuilder.toString()));
+
             selectElement.addElement(new TextElement("<include refid=\"Example_Where_Clause\" />"));
 
         } else {
@@ -68,7 +77,15 @@ public boolean sqlMapDocumentGenerated(Document document, IntrospectedTable intr
             includeBaseElement.addAttribute(new Attribute("refid", "Base_Column_List"));
             selectElement.addElement(includeBaseElement);
 
-            selectElement.addElement(new TextElement("from " + tableName + " mt"));
+            StringBuilder stringBuilder = new StringBuilder("from " + tableName + " mt");
+            List<ForeignKeyItem> foreignKeyItemList = getForeignKeys(introspectedTable);
+            if (!foreignKeyItemList.isEmpty()) {
+                for (int i = 0; i < foreignKeyItemList.size(); i++) {
+                    stringBuilder.append("\n");
+                    stringBuilder.append("    left join ").append(foreignKeyItemList.get(i).getPkTableName()).append(" childT").append(i + 1).append(" on mt.").append(foreignKeyItemList.get(i).getFkColumnName()).append(" = childT").append(i + 1).append(".").append(foreignKeyItemList.get(i).getPkColumnName());
+                }
+            }
+            selectElement.addElement(new TextElement(stringBuilder.toString()));
             selectElement.addElement(new TextElement("<include refid=\"Example_Where_Clause\" />"));
         }