From d631cdd15f06864f2eb5218e77a59145c64afc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 25 Feb 2026 17:21:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug-1327=20=E8=AE=BE=E5=A4=87=E7=9A=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=8F=82=E6=95=B0=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E8=83=BD=E5=90=A6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BA=E4=B8=8E=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B8=80=E8=87=B4=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/admin/controller/ProductModelController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index cb250503..75d66ce4 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -558,7 +558,8 @@ public class ProductModelController extends ControllerBase { if (CollectionUtil.isNotEmpty(paramsItems)) { AtomicInteger rowIndex = new AtomicInteger(4); List cnItems = paramsItems.stream().filter(item -> StrUtil.equals(item.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)).collect(Collectors.toList()); - Map> itemMap = cnItems.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName)); + cnItems.sort(Comparator.comparing(ProductModelParamsItem::getBatchNumber)); + Map> itemMap = cnItems.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName, LinkedHashMap::new, Collectors.toList())); AtomicInteger row = new AtomicInteger(rowIndex.get()); itemMap.forEach((indexName, itemData) -> { int itemSize = itemData.size();