From d9746fdbb7843c9f9d454dd3e2ec8083daae2d7d Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 12 Jul 2018 14:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mybatis/mapper/dict/DictInTermTypeMapper.java | 11 +++++++++-- .../dao/mybatis/mapper/dict/DictTermTypeMapper.java | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java index 7190d38a0..5565fe3df 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java @@ -34,13 +34,20 @@ public class DictInTermTypeMapper extends AbstractSqlTermCustomer { } private boolean support(RDBColumnMetaData column) { + if(column.getJdbcType()== JDBCType.VARCHAR){ + return false; + } Class type = column.getJavaType(); if (type != null && type.isArray()) { type = type.getComponentType(); } - return ((type != null && type.isEnum() && EnumDict.class.isAssignableFrom(type)) + + return ((type != null && type.isEnum() + && EnumDict.class.isAssignableFrom(type) + && column.getJavaType().isArray()) || - (column.getProperty(USE_DICT_MASK_FLAG).isTrue() && column.getOptionConverter() != null)); + (column.getProperty(USE_DICT_MASK_FLAG).isTrue() + && column.getOptionConverter() != null)); } @SuppressWarnings("all") diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java index 374c1a0a7..40ff0b415 100644 --- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java +++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java @@ -34,11 +34,16 @@ public class DictTermTypeMapper extends AbstractSqlTermCustomer { } private boolean support(RDBColumnMetaData column) { + if (column.getJdbcType() == JDBCType.VARCHAR) { + return false; + } Class type = column.getJavaType(); if (type != null && type.isArray()) { type = type.getComponentType(); } - return ((type != null && type.isEnum() && EnumDict.class.isAssignableFrom(type)) + return ((type != null && type.isEnum() + && EnumDict.class.isAssignableFrom(type) + && column.getJavaType().isArray()) || (column.getProperty(USE_DICT_MASK_FLAG).isTrue() && column.getOptionConverter() != null)); }