Skip to content

Commit 60d3813

Browse files
committed
简化 Example 中的 variables 方法
1 parent 816180d commit 60d3813

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

mapper/src/main/java/io/mybatis/mapper/example/Example.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -1382,13 +1382,9 @@ protected Criterion(String condition, Object value, Object secondValue) {
13821382
this(condition, value, secondValue, null);
13831383
}
13841384

1385-
public String variables(String prefix, String field) {
1385+
public String variables(String field) {
13861386
StringBuilder variables = new StringBuilder();
1387-
variables.append("#{");
1388-
if(prefix != null && !prefix.isEmpty()) {
1389-
variables.append(prefix).append(".");
1390-
}
1391-
variables.append(field);
1387+
variables.append("#{").append(field);
13921388
if (typeHandler != null && !typeHandler.isEmpty()) {
13931389
variables.append(",typeHandler=").append(typeHandler);
13941390
}

mapper/src/main/java/io/mybatis/mapper/example/ExampleProvider.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ExampleProvider {
3737
" ${setValue.condition},\n" +
3838
" </when>\n" +
3939
" <when test=\"setValue.singleValue\">\n" +
40-
" ${setValue.condition} = ${setValue.variables('setValue', 'value')},\n" +
40+
" ${setValue.condition} = ${setValue.variables('setValue.value')},\n" +
4141
" </when>\n" +
4242
" </choose>\n" +
4343
" </foreach>\n" +
@@ -48,17 +48,17 @@ public class ExampleProvider {
4848
" AND ${criterion.condition}\n" +
4949
" </when>\n" +
5050
" <when test=\"criterion.singleValue\">\n" +
51-
" AND ${criterion.condition} ${criterion.variables('criterion', 'value')}\n" +
51+
" AND ${criterion.condition} ${criterion.variables('criterion.value')}\n" +
5252
" </when>\n" +
5353
" <when test=\"criterion.betweenValue\">\n" +
54-
" AND ${criterion.condition} ${criterion.variables('criterion', 'value')} AND\n" +
55-
" ${criterion.variables('criterion', 'secondValue')}\n" +
54+
" AND ${criterion.condition} ${criterion.variables('criterion.value')} AND\n" +
55+
" ${criterion.variables('criterion.secondValue')}\n" +
5656
" </when>\n" +
5757
" <when test=\"criterion.listValue\">\n" +
5858
" AND ${criterion.condition}\n" +
5959
" <foreach close=\")\" collection=\"criterion.value\" item=\"listItem\"\n" +
6060
" open=\"(\" separator=\",\">\n" +
61-
" ${criterion.variables(null, 'listItem')}\n" +
61+
" ${criterion.variables('listItem')}\n" +
6262
" </foreach>\n" +
6363
" </when>\n";
6464

0 commit comments

Comments
 (0)