修复枚举数组解析错误问题 hs-web#150

zhou-hao · zhou-hao · commit 3620ff9f7047 · 2020-01-07T18:08:58.000+08:00
diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java
@@ -258,7 +258,8 @@ public Object getData(Object value) {
             } else if (column.getJavaType() == boolean.class || column.getJavaType() == Boolean.class) {
                 column.setValueConverter(new BooleanValueConverter(column.getJdbcType()));
                 column.setProperty("typeHandler", NumberBooleanTypeHandler.class.getName());
-            } else if (column.getJavaType().isEnum()) {
+            } else if (column.getJavaType().isEnum() || (
+                    column.getJavaType().isArray() && column.getJavaType().getComponentType().isEnum())) {
                 //ignore
             } else if (TypeUtils.isNumberType(column)) { //数字
                 //数字
diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/jpa/JpaAnnotationParser.java
@@ -89,16 +89,16 @@ public class JpaAnnotationParser {
         });
 
         jdbcTypeConvert.add((type, property) -> {
-            boolean isArray = type.isArray();
+            Class<?> propertyType = property.getPropertyType();
+            boolean isArray = propertyType.isArray();
             if (isArray) {
-                type = type.getComponentType();
-
+                propertyType = propertyType.getComponentType();
             }
-            if (type.isEnum() && EnumDict.class.isAssignableFrom(type)) {
-                Class genType = ClassUtils.getGenericType(type);
+            if (propertyType.isEnum() && EnumDict.class.isAssignableFrom(propertyType)) {
                 if (isArray) {
                     return JDBCType.BIGINT;
                 }
+                Class<?> genType = ((EnumDict<?>) propertyType.getEnumConstants()[0]).getValue().getClass();
                 return jdbcTypeMapping.getOrDefault(genType, JDBCType.VARCHAR);
             }
             return null;
