Skip to content

Commit a07066c

Browse files
committed
解决使用JPA时两个可能为null的属性,发布2.2.2版本,fixed #mybatis-mapper/mapper#92
1 parent 193a669 commit a07066c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>io.mybatis</groupId>
2424
<artifactId>mybatis-provider</artifactId>
25-
<version>2.2.1</version>
25+
<version>2.2.2</version>
2626

2727
<name>MyBatis Provider</name>
2828
<description>MyBatis Provider 扩展</description>

src/main/java/io/mybatis/provider/keysql/KeySqlMsCustomize.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ public void customize(EntityTable entity, MappedStatement ms, ProviderContext co
7474
MetaObject metaObject = ms.getConfiguration().newMetaObject(ms);
7575
metaObject.setValue("keyGenerator", Jdbc3KeyGenerator.INSTANCE);
7676
metaObject.setValue("keyProperties", new String[]{id.property()});
77-
} else if (!id.afterSql().isEmpty()) {
77+
} else if (id.afterSql() != null && !id.afterSql().isEmpty()) {
7878
KeyGenerator keyGenerator = handleSelectKeyGenerator(ms, id, id.afterSql(), false);
7979
MetaObject metaObject = ms.getConfiguration().newMetaObject(ms);
8080
metaObject.setValue("keyGenerator", keyGenerator);
8181
metaObject.setValue("keyProperties", new String[]{id.property()});
82-
} else if (id.genId() != GenId.NULL.class) {
82+
} else if (id.genId() != null && id.genId() != GenId.NULL.class) {
8383
Class<? extends GenId> genIdClass = id.genId();
8484
boolean executeBefore = id.genIdExecuteBefore();
8585
GenId<?> genId = null;

0 commit comments

Comments
 (0)