Merge branch 'feature/product' into develop

This commit is contained in:
曹鹏飞 2025-07-01 18:14:13 +08:00
commit 25d6fdf863
1 changed files with 2 additions and 1 deletions

View File

@ -153,9 +153,10 @@ public class ProductModelParamsItemServiceImpl extends ServiceImpl<ProductModelP
.filter(pi -> StrUtil.isNotBlank(pi.getName())) .filter(pi -> StrUtil.isNotBlank(pi.getName()))
.map(pi -> Convert.convert(ProductParamsItemVO.class, pi)) .map(pi -> Convert.convert(ProductParamsItemVO.class, pi))
.collect(Collectors.toList())); .collect(Collectors.toList()));
ivo.getItems().sort(Comparator.comparing(ProductParamsItemVO::getBatchNumber));
vo.getItems().add(ivo); vo.getItems().add(ivo);
}); });
vo.getItems().sort(Comparator.comparing(ProductModelMainParamsItemChildrenVO::getIndexName)); vo.getItems().sort(Comparator.comparing(ProductModelMainParamsItemChildrenVO::getBatchNumber));
}); });
vos.sort(Comparator.comparing(ProductModelParamsItemVO::getLanguageCode)); vos.sort(Comparator.comparing(ProductModelParamsItemVO::getLanguageCode));
return vos; return vos;