diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index c7266bf96..82fb6c1ec 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -356,6 +356,10 @@ public class PlanServiceImpl implements PlanService { IPage orderRespVOCopies = orderMapper.selectOrderPage(page, queryWrapperX); + if (CollectionUtil.isEmpty(orderRespVOCopies.getRecords())) { + return new PageResult<>(); + } + List records = orderRespVOCopies.getRecords(); List orderIds = records.stream().map(m -> m.getOrderId()).collect(Collectors.toList()); @@ -383,9 +387,7 @@ public class PlanServiceImpl implements PlanService { orderRespVOCopies.setTotal(filteredRecords.size()); - if (CollectionUtil.isEmpty(records)) { - return new PageResult<>(); - } + return new PageResult<>(orderRespVOCopies.getRecords(), orderRespVOCopies.getTotal());