Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-11-20 5fb1f180d0e6eceb83cda226c1daeca3f634e813

 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;