简化 Example 中的 variables 方法

mybatis-mapper · May 20, 2024 · 60d3813 · 60d3813
1 parent 816180d
commit 60d3813
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/mapper/src/main/java/io/mybatis/mapper/example/Example.java b/mapper/src/main/java/io/mybatis/mapper/example/Example.java
@@ -1382,13 +1382,9 @@ protected Criterion(String condition, Object value, Object secondValue) {
       this(condition, value, secondValue, null);
     }
 
-    public String variables(String prefix, String field) {
+    public String variables(String field) {
       StringBuilder variables = new StringBuilder();
-      variables.append("#{");
-      if(prefix != null && !prefix.isEmpty()) {
-        variables.append(prefix).append(".");
-      }
-      variables.append(field);
+      variables.append("#{").append(field);
       if (typeHandler != null && !typeHandler.isEmpty()) {
         variables.append(",typeHandler=").append(typeHandler);
       }

diff --git a/mapper/src/main/java/io/mybatis/mapper/example/ExampleProvider.java b/mapper/src/main/java/io/mybatis/mapper/example/ExampleProvider.java
@@ -37,7 +37,7 @@ public class ExampleProvider {
           "        ${setValue.condition},\n" +
           "      </when>\n" +
           "      <when test=\"setValue.singleValue\">\n" +
-          "        ${setValue.condition} = ${setValue.variables('setValue', 'value')},\n" +
+          "        ${setValue.condition} = ${setValue.variables('setValue.value')},\n" +
           "      </when>\n" +
           "    </choose>\n" +
           "  </foreach>\n" +
@@ -48,17 +48,17 @@ public class ExampleProvider {
           "              AND ${criterion.condition}\n" +
           "            </when>\n" +
           "            <when test=\"criterion.singleValue\">\n" +
-          "              AND ${criterion.condition} ${criterion.variables('criterion', 'value')}\n" +
+          "              AND ${criterion.condition} ${criterion.variables('criterion.value')}\n" +
           "            </when>\n" +
           "            <when test=\"criterion.betweenValue\">\n" +
-          "              AND ${criterion.condition} ${criterion.variables('criterion', 'value')} AND\n" +
-          "              ${criterion.variables('criterion', 'secondValue')}\n" +
+          "              AND ${criterion.condition} ${criterion.variables('criterion.value')} AND\n" +
+          "              ${criterion.variables('criterion.secondValue')}\n" +
           "            </when>\n" +
           "            <when test=\"criterion.listValue\">\n" +
           "              AND ${criterion.condition}\n" +
           "              <foreach close=\")\" collection=\"criterion.value\" item=\"listItem\"\n" +
           "                open=\"(\" separator=\",\">\n" +
-          "                ${criterion.variables(null, 'listItem')}\n" +
+          "                ${criterion.variables('listItem')}\n" +
           "              </foreach>\n" +
           "            </when>\n";