From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index eac2f32..4036c9e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -33,7 +33,7 @@
result = orderDetails.stream()
.collect(Collectors.collectingAndThen(
Collectors.toMap(
- map -> map.get("order_id") + "_" + map.get("order_number"),
+ map -> map.get("order_id"),
map -> map,
(existing, replacement) -> existing // 淇濈暀绗竴涓嚭鐜扮殑
),
@@ -42,13 +42,12 @@
//寰幆鑾峰彇鍥剧墖
List<OrderFile> orderFiles = new ArrayList<>();
for (Map<String,Object> obj : result) {
- OrderFile orderFile = orderFileMapper.selectOne(new QueryWrapper<OrderFile>()
+ List<OrderFile> orderFile = orderFileMapper.selectList(new QueryWrapper<OrderFile>()
.select("order_id, order_number, image_base64")
.eq("order_id", obj.get("order_id"))
- .eq("order_number", obj.get("order_number"))
);
if (orderFile != null){
- orderFiles.add(orderFile);
+ orderFiles.addAll(orderFile);
}
}
return orderFiles;
--
Gitblit v1.8.0