From 718af5bfe728ac3944c2a0fafe103fe42aecfcd4 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 10 Oct 2024 13:42:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=81=E6=A0=87=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=83=A8=E9=97=A8=E9=AA=8C=E8=AF=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/laws/common/util/ImportUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 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); } } // 单选人员