Merge branch 'develop' of github.com:mybatis-mapper/mapper into develop

abel533 · abel533 · commit d1f4ab82f732 · 2022-06-30T00:28:56.000+08:00
diff --git a/jpa/src/main/java/io/mybatis/provider/jpa/JpaEntityClassFinder.java b/jpa/src/main/java/io/mybatis/provider/jpa/JpaEntityClassFinder.java
@@ -30,7 +30,7 @@ public class JpaEntityClassFinder extends GenericEntityClassFinder {
   @Override
   public boolean isEntityClass(Class<?> clazz) {
     //带注解或不是简单类型和枚举的都算实体
-    return clazz.isAnnotationPresent(Table.class) || (!SimpleTypeUtil.isSimpleType(clazz) && !clazz.isEnum());
+    return clazz.isAnnotationPresent(Table.class) || (!clazz.isPrimitive() && !SimpleTypeUtil.isSimpleType(clazz) && !clazz.isEnum());
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class JpaEntityClassFinder extends GenericEntityClassFinder {`
`30`	`30`	`@Override`
`31`	`31`	`public boolean isEntityClass(Class<?> clazz) {`
`32`	`32`	`//带注解或不是简单类型和枚举的都算实体`
`33`		`- return clazz.isAnnotationPresent(Table.class) \|\| (!SimpleTypeUtil.isSimpleType(clazz) && !clazz.isEnum());`
	`33`	`+ return clazz.isAnnotationPresent(Table.class) \|\| (!clazz.isPrimitive() && !SimpleTypeUtil.isSimpleType(clazz) && !clazz.isEnum());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`