From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 6654ad3..aef9f1f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -61,15 +61,14 @@
//鏌ヨ寰呮椤圭洰
@Override
- public IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
+ public IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids) {
List<Integer> noIds = null;
if (StringUtils.isNotBlank(ids)) {
- noIds = Arrays.asList(ids.split(",")).stream()
+ noIds = Arrays.stream(ids.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
}
- IPage<InsProduct> insProductIPage = baseMapper.selectNoProducts(page, orderId, noIds);
- return insProductIPage;
+ return baseMapper.selectNoProducts(page, orderId, noIds);
}
//瀹℃牳寰呮鎾ら攢
@@ -135,7 +134,8 @@
product.setTemplate(null);
product.setStyle(null);
return product;
- }).collect(Collectors.toList());
+ }).sorted((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
+ - (o2.getSort() == null ? 0 : o2.getSort())).collect(Collectors.toList());
return insProducts;
}
--
Gitblit v1.9.3