From a07922a3d3b9890d8d25a41e74ded884c2bed802 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 17 Aug 2026 21:19:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E8=A1=8C=E6=A0=87=E8=AF=86=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubPackageRelationServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/subpackagerelation/SubPackageRelationServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/subpackagerelation/SubPackageRelationServiceImpl.java index 2a3e98ac..49b79ebc 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/subpackagerelation/SubPackageRelationServiceImpl.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/subpackagerelation/SubPackageRelationServiceImpl.java @@ -75,10 +75,17 @@ public class SubPackageRelationServiceImpl implements SubPackageRelationService failures.add(buildFailure(null, rowIndex, REQUIRED_FIELD_MISSING, "缺失字段：item")); continue; } - List missingFields = new ArrayList<>(); if (!StringUtils.hasText(item.getClientKey())) { - missingFields.add("clientKey"); + failures.add(buildFailure(item.getClientKey(), rowIndex, REQUIRED_FIELD_MISSING, + "缺失字段：clientKey")); + continue; } + if (clientKeyCounts.get(item.getClientKey()) > 1) { + failures.add(buildFailure(item.getClientKey(), rowIndex, DUPLICATE_CLIENT_KEY, + "前端行标识 clientKey 重复")); + continue; + } + List missingFields = new ArrayList<>(); if (!StringUtils.hasText(item.getPackageBoxSn())) { missingFields.add("packageBoxSn"); } @@ -102,11 +109,6 @@ public class SubPackageRelationServiceImpl implements SubPackageRelationService "缺失字段：" + String.join("、", missingFields))); continue; } - if (clientKeyCounts.get(item.getClientKey()) > 1) { - failures.add(buildFailure(item.getClientKey(), rowIndex, DUPLICATE_CLIENT_KEY, - "前端行标识 clientKey 重复")); - continue; - } validItems.add(new BatchItemContext(item, rowIndex)); } if (CollUtil.isEmpty(validItems)) {