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();