From 19a7256cb6e9d6b9446edbb81e93a344a4f1e440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 7 Aug 2020 21:58:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=94=AF=E6=8C=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=8E=E5=8F=82=E6=95=B0=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java index cdeb3aa..7220b2f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -47,17 +47,15 @@ public final class BarcodeParseUtil { String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator()); String[] barcodeValue = barcode.split(barcodeRule.getBarcodeSeparator()); + // 避免出现长度不相等 + int size = barcodeKey.length; if (barcodeKey.length != barcodeValue.length) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("条码与规则不匹配！") - .build(); + size = Math.min(barcodeKey.length,barcodeValue.length); } // 匹配条码数据 HashMap barcodeMap = new HashMap<>(); - for (int i = 0; i < barcodeKey.length; i++) { + for (int i = 0; i < size; i++) { barcodeMap.put(barcodeKey[i], barcodeValue[i]); } return barcodeMap;