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 011b683d1..c4125d1fe 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 @@ -253,7 +253,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { .in(OrderComponentDO::getTopId, topIds) .eq(OrderComponentDO::getOrderId, orderId) .eqIfPresent(OrderComponentDO::getDeleted, pageReqVO.isDeleted()) - .select(OrderComponentDO::getId)); + .select(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId)); if (CollUtil.isNotEmpty(orderComponentDOS)) { componentIds = orderComponentDOS.stream().map(OrderComponentDO::getId).collect(Collectors.toSet()); } else { @@ -269,10 +269,9 @@ public class OrderComponentServiceImpl implements OrderComponentService { IPage viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, null, null, componentIds, true); List records = viewPlatesPage.getRecords(); - long total = viewPlatesPage.getTotal(); List resultList = new ArrayList<>(); - if(total > 0) { + if(CollUtil.isNotEmpty(records)) { resultList = records.stream().map(item -> { OrderViewPlatePageRespVO vo = new OrderViewPlatePageRespVO(); BeanUtil.copyProperties(item, vo);