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 b5c282fa..2a6ca54a 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 @@ -385,7 +385,10 @@ public class ImportUtil { // 企标稽查内容文件导入 if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) { - if (!this.inspectContentFileValid(cellValue, fileMap)) { + List departList = sysDepartService.list(); + Map> deaprtMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName)); + Map departPartMap = SysDepart.buildPaths(departList); + if (!this.inspectContentFileValid(cellValue, fileMap, deaprtMap, departPartMap)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { @@ -808,7 +811,8 @@ public class ImportUtil { } // 文件校验 - private boolean inspectContentFileValid(String cellValue, Map fileMap) { + private boolean inspectContentFileValid(String cellValue, Map fileMap, + Map> deaprtMap, Map departPartMap) { // 检查是否真的有这个文件 if (!this.fileValid(cellValue, fileMap)) { return false; @@ -835,12 +839,12 @@ public class ImportUtil { String cellContent2 = getCellContent(row.getCell(1)); String cellContent3 = getCellContent(row.getCell(2)); // 执行valid方法进行校验 - if (!valid(cellContent1, cellContent2)) { + if (!valid(cellContent1, cellContent2, cellContent3, deaprtMap, departPartMap)) { return false; } } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); return false; } return true; @@ -876,9 +880,16 @@ public class ImportUtil { } // 必填校验 - private boolean valid(String content1, String content2) { + private boolean valid(String content1, String content2, String content3, Map> deaprtMap, Map departPartMap) { // 这里只做简单的非空校验 - return content1 != null && !content1.trim().isEmpty() && content2 != null && !content2.trim().isEmpty(); + if (content1 != null && !content1.trim().isEmpty() && content2 != null && !content2.trim().isEmpty()) { + if (StrUtil.isNotBlank(content3)) { + return multiOrgValid(content3, deaprtMap, departPartMap); + } + return true; + } else { + return false; + } } }