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)) {