From ef754fdc44b55699c75600d9ad9b00e550311317 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 7 Nov 2023 18:06:39 +0800 Subject: [PATCH] fix: 78283 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 海外/国内--导入--适用车型字段不能多个导入 --- .../jero/modules/laws/common/util/ImportUtil.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index a463c953..5b3b7ec5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -309,8 +309,7 @@ public class ImportUtil { } // 下拉单选 - if (FieldShowTypeEnum.DROPDOWN_SINGLE_SELECT.getValue().equals(tag.getFieldShowType()) || - FieldShowTypeEnum.DROPDOWN_MULTI_SELECT.getValue().equals(tag.getFieldShowType())) { + if (FieldShowTypeEnum.DROPDOWN_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) { if (!this.singleDictValid(tag.getDictField(), cellValue)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); @@ -319,6 +318,18 @@ public class ImportUtil { cellValue = this.convertDictValue(tag.getDictField(), cellValue); } } + + // 下拉多选 + if (FieldShowTypeEnum.DROPDOWN_MULTI_SELECT.getValue().equals(tag.getFieldShowType())) { + if (!this.dictValid(tag.getDictField(), cellValue)) { + log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); + errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); + } else { + // 转为value + cellValue = this.convertDictValue(tag.getDictField(), cellValue); + } + } + // 单选组织机构 if (FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType())) { if (!this.singleOrgValid(cellValue)) {