From 56d4c1384e82ee782e1b59ba90fff045ecefa3d8 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 10 Jul 2018 17:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dict/DictionaryOptionalConvertBuilderStrategy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java index 10f22c996..25e3f31b0 100644 --- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java +++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/dict/DictionaryOptionalConvertBuilderStrategy.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import org.hswebframework.ezorm.core.OptionConverter; import org.hswebframework.ezorm.core.ValueConverter; import org.hswebframework.ezorm.rdb.meta.RDBColumnMetaData; +import org.hswebframework.web.dao.mybatis.mapper.dict.DictInTermTypeMapper; import org.hswebframework.web.dict.DictDefineRepository; import org.hswebframework.web.dict.EnumDict; import org.hswebframework.web.entity.form.DictConfig; @@ -64,9 +65,9 @@ public class DictionaryOptionalConvertBuilderStrategy implements OptionalConvert converter.setMulti(multi); RDBColumnMetaData column = dictConfig.getColumn(); - if (multi && column.getJdbcType() == JDBCType.NUMERIC) { + if (multi && (column.getJdbcType() == JDBCType.NUMERIC || column.getJdbcType() == JDBCType.BIGINT)) { if (supplier.get().size() < 64) { - column.setProperty("dict-mask", true); + column.setProperty(DictInTermTypeMapper.USE_DICT_MASK_FLAG, true); converter.setDataToMask(true); } else { throw new UnsupportedOperationException("数据类型为数字,并且数据字典选项数量超过64个,不支持多选!");