解决使用JPA时两个可能为null的属性，发布2.2.2版本，fixed #mybatis-mapper/mapper#92

mybatis-mapper · Dec 5, 2023 · a07066c · a07066c
1 parent 193a669
commit a07066c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.mybatis</groupId>
   <artifactId>mybatis-provider</artifactId>
-  <version>2.2.1</version>
+  <version>2.2.2</version>
 
   <name>MyBatis Provider</name>
   <description>MyBatis Provider 扩展</description>

diff --git a/src/main/java/io/mybatis/provider/keysql/KeySqlMsCustomize.java b/src/main/java/io/mybatis/provider/keysql/KeySqlMsCustomize.java
@@ -74,12 +74,12 @@ public void customize(EntityTable entity, MappedStatement ms, ProviderContext co
         MetaObject metaObject = ms.getConfiguration().newMetaObject(ms);
         metaObject.setValue("keyGenerator", Jdbc3KeyGenerator.INSTANCE);
         metaObject.setValue("keyProperties", new String[]{id.property()});
-      } else if (!id.afterSql().isEmpty()) {
+      } else if (id.afterSql() != null && !id.afterSql().isEmpty()) {
         KeyGenerator keyGenerator = handleSelectKeyGenerator(ms, id, id.afterSql(), false);
         MetaObject metaObject = ms.getConfiguration().newMetaObject(ms);
         metaObject.setValue("keyGenerator", keyGenerator);
         metaObject.setValue("keyProperties", new String[]{id.property()});
-      } else if (id.genId() != GenId.NULL.class) {
+      } else if (id.genId() != null && id.genId() != GenId.NULL.class) {
         Class<? extends GenId> genIdClass = id.genId();
         boolean executeBefore = id.genIdExecuteBefore();
         GenId<?> genId = null;