lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-01 18:35:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复非多选查询错误

Browse Source
This commit is contained in:
zhouhao
2018-07-12 14:36:17 +08:00
parent 0648d7feaa
commit d9746fdbb7
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictInTermTypeMapper.java
View File

@@ -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")

7
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/mapper/dict/DictTermTypeMapper.java
View File

@@ -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));
}