ソースを参照

修复javaType 可能为空

zhouhao 6 年 前
コミット
7291bea900

+ 2 - 2
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java

@@ -35,10 +35,10 @@ public class DictInTermTypeMapper extends AbstractSqlTermCustomer {
 
     private boolean support(RDBColumnMetaData column) {
         Class type = column.getJavaType();
-        if (type.isArray()) {
+        if (type != null && type.isArray()) {
             type = type.getComponentType();
         }
-        return ((type.isEnum() && EnumDict.class.isAssignableFrom(type))
+        return ((type != null && type.isEnum() && EnumDict.class.isAssignableFrom(type))
                 ||
                 (column.getProperty(USE_DICT_MASK_FLAG).isTrue() && column.getOptionConverter() != null));
     }

+ 3 - 2
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java

@@ -35,14 +35,15 @@ public class DictTermTypeMapper extends AbstractSqlTermCustomer {
 
     private boolean support(RDBColumnMetaData column) {
         Class type = column.getJavaType();
-        if (type.isArray()) {
+        if (type != null && type.isArray()) {
             type = type.getComponentType();
         }
-        return ((type.isEnum() && EnumDict.class.isAssignableFrom(type))
+        return ((type != null && type.isEnum() && EnumDict.class.isAssignableFrom(type))
                 ||
                 (column.getProperty(USE_DICT_MASK_FLAG).isTrue() && column.getOptionConverter() != null));
     }
 
+
     @SuppressWarnings("all")
     private List<EnumDict> getAllOption(RDBColumnMetaData column) {
         Class type = column.getJavaType();