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)); // 查询所有板件的视图所需信息