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 791c414d..062495c1 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 @@ -277,15 +277,12 @@ public class ImportUtil { // 组织机构 if (FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType()) || FieldShowTypeEnum.MULTI_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType())) { - List departList = sysDepartService.list(); - Map> deaprtMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName)); - Map departPartMap = SysDepart.buildPaths(departList); - if (!this.multiOrgValid(cellValue, deaprtMap, departPartMap)) { + if (!this.multiOrgValid(cellValue, sysDepartMap, sysDepartPathMap)) { log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { // 转为id - cellValue = this.convertMultiOrgId(cellValue, deaprtMap, departPartMap); + cellValue = this.convertMultiOrgId(cellValue, sysDepartMap, sysDepartPathMap); } } // 单选人员