ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 78283

Browse Source 
海外/国内--导入--适用车型字段不能多个导入
This commit is contained in:
mzaxd
2023-11-08 08:57:59 +08:00
parent bf304c975c
commit ef754fdc44
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+13 -2
View File
@@ -309,8 +309,7 @@ public class ImportUtil {
} }
// 下拉单选 // 下拉单选
if (FieldShowTypeEnum.DROPDOWN_SINGLE_SELECT.getValue().equals(tag.getFieldShowType()) || if (FieldShowTypeEnum.DROPDOWN_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) {
FieldShowTypeEnum.DROPDOWN_MULTI_SELECT.getValue().equals(tag.getFieldShowType())) {
if (!this.singleDictValid(tag.getDictField(), cellValue)) { if (!this.singleDictValid(tag.getDictField(), cellValue)) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
@@ -319,6 +318,18 @@ public class ImportUtil {
cellValue = this.convertDictValue(tag.getDictField(), cellValue); 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 (FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType())) {
if (!this.singleOrgValid(cellValue)) { if (!this.singleOrgValid(cellValue)) {