From 34887a96524725a40a42d8c8f2117bf986c3a5a3 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 9 Mar 2026 11:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=9C=E4=BD=93=E3=80=81=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=AF=B9=E4=BA=8EcadViewFi?= =?UTF-8?q?leId=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/assemblylist/AssemblyListServiceImpl.java | 2 ++ .../service/ordercomponent/OrderComponentServiceImpl.java | 2 ++ .../cf/imes/module/executor/service/plate/PlateServiceImpl.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java index c3d5223cf..c2ba8ce7b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java @@ -660,6 +660,7 @@ public class AssemblyListServiceImpl implements AssemblyListService { } // 整理出id和cadViewFileId的对应关系 Map cadViewFileIdMap = orderComponentDOS.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId)); // 分页查询板件 @@ -721,6 +722,7 @@ public class AssemblyListServiceImpl implements AssemblyListService { // 整理出id和cadViewFileId的对应关系 Map cadViewFileIdMap = orderComponentDOS.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId)); // 查询所有板件的视图所需信息 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index ff630c1fc..c6f7c0c7f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -221,6 +221,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { } // 整理出id和cadViewFileId的对应关系 Map cadViewFileIdMap = orderComponentDOS.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId)); // 分页查询板件 @@ -274,6 +275,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { // 整理出id和cadViewFileId的对应关系 Map cadViewFileIdMap = orderComponentDOS.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId)); // 查询所有板件的视图所需信息 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 82658dc6b..665a38da8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -821,6 +821,7 @@ public class PlateServiceImpl implements PlateService { // 整理出body_id和cad图纸id的关系 Map bodyIdAndCadViewFileIdMap = orderBodyDOList.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderBodyDO::getId, OrderBodyDO::getCadViewFileId)); PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); @@ -854,6 +855,7 @@ public class PlateServiceImpl implements PlateService { // 整理出body_id和cad图纸id的关系 Map bodyIdAndCadViewFileIdMap = orderBodyDOList.stream() + .filter(item -> item.getCadViewFileId() != null) .collect(Collectors.toMap(OrderBodyDO::getId, OrderBodyDO::getCadViewFileId)); // 查询所有板件的视图所需信息