From 4bdb5aeaa9976941ddf5b868ff30b3d8142a5519 Mon Sep 17 00:00:00 2001 From: "446052889@qq.com" <446052889@qq.com> Date: Wed, 21 Sep 2022 13:40:10 +0800 Subject: [PATCH] =?UTF-8?q?bug5144=EF=BC=8C=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=B7=E6=96=B0=E6=A0=A1=E9=AA=8CPAL?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D=E6=9C=BA?= =?UTF-8?q?=E5=88=B6=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=AA=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?Excel=E4=B8=AD=E5=8C=85=E5=90=AB=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....actionsoft.apps.coe.pal.datamigration.jar | Bin 283770 -> 283799 bytes .../web/VersionNoExcelImportWeb.java | 16 +++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar index e1dd3e957e2bf66a6261f810f58b1e1e4b105670..e9483c0f9a88c496af9a0ff66a496e76589398ce 100644 GIT binary patch delta 13914 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 delta 13756 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 palNameMap = new HashMap<>(); - Set methodSet = new HashSet<>(); + Map> methodMap = new HashMap<>(); for (VersionNoExcelModel model : excelModelList) { String processType = model.getProcessType(); if (UtilString.isNotEmpty(processType)) { if (map.containsKey(processType)) { - methodSet.add(map.get(processType)); + if (!methodMap.containsKey(map.get(processType))) { + methodMap.put(map.get(processType), new ArrayList<>()); + } + methodMap.get(map.get(processType)).add(model.getProcessName()); } } } - for (String methodId : methodSet) { + for (String methodId : methodMap.keySet()) { Map palNameMap2 = ProcessUtil.getPalRepositoryNameMap(wsId, methodId);// 获取模型以及模型的名称 - ResponseObject checkRepeatPalNameRo = checkRepositoryNameRepeat(palNameMap2, methodId); + ResponseObject checkRepeatPalNameRo = checkRepositoryNameRepeat(palNameMap2, methodId, methodMap.get(methodId)); if (!checkRepeatPalNameRo.isOk()) { msg = Constant.LOG_ERROR + checkRepeatPalNameRo.getMsg() + "," + Constant.IMPORT_STOP_MSG; updateErrLog(msg, msg); @@ -344,12 +347,15 @@ public class VersionNoExcelImportWeb extends ActionWeb { * @param palNameMap * @return */ - private ResponseObject checkRepositoryNameRepeat(Map palNameMap, String methodId) { + private ResponseObject checkRepositoryNameRepeat(Map palNameMap, String methodId, List list) { boolean isOk = true; Map> map = new HashMap<>(); for (Map.Entry entry : palNameMap.entrySet()) { String palId = entry.getKey(); String name = entry.getValue(); + if (!list.contains(name)) {// 只校验excel中存在的相关模型名称 + continue; + } if (!map.containsKey(name)) { map.put(name, new ArrayList<>()); }