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