diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java index 873d91c1..52b514ae 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -47,7 +47,10 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { EquOrder order = equOrderMapper.selectEquOrderByOrderId(orderId); // 设置计划名称 EquPlan equPlan = equPlanMapper.selectEquPlanByPlanCode(order.getPlanCode()); - order.setPlanName(equPlan.getPlanName()); + if (equPlan != null) { + order.setPlanName(equPlan.getPlanName()); + } + // 替换循环周期 order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType()));