缺少装备的预案启动报错

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -117,29 +117,30 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             List<PlanEquipment> equipmentList = planEquipmentDao.findByPlanId(PlanDetailOp.get().getId());
             //预案启动
             if (PlanDetailOp.get() != null) {
-                //电力设备
-                Equipment equipment = equipmentService.queryOne(equipmentList.get(0).getFireEquipmentId());
                 //获取规则名称
                 List<PlanRule> planRuleList = planRuleDao.getPlanDocsByPlanId(Long.valueOf(vo.getPlanId()));
                 if (planRuleList.size() == 0) {
                     result.setMessage(ReserveEnum.NOPLAN.getText());
                     return result;
                 }
-                equipment.setReservePlan("换流站消防专项预案" + "/" + planRuleList.get(0).getRuleId());
+                //电力设备
+                Equipment equipment = equipmentService.queryOne(equipmentList.get(0).getFireEquipmentId());
                 if (equipment == null) {
                     result.setMessage(ReserveEnum.NOEQUIP.getText());
                     return result;
                 }
+                equipment.setReservePlan("换流站消防专项预案" + "/" + planRuleList.get(0).getRuleId());
+
                 //电力设备绑定装备
                 List<EquipmentFireEquipment> equipmentFireEquipmentList = equipmentFireEquipmentDao.findAllByEquipmentId(equipmentList.get(0).getFireEquipmentId());
                 if (equipmentFireEquipmentList.size() == 0) {
-                    result.setMessage(ReserveEnum.NOFIRE.getText());
+                    result.setMessage("该预案保护的电力设备尚未绑定配套的火灾报警设备");
                     return result;
                 }
                 //查询设备
                 EquipmentSpecificForRiskVo equipmentSpecific = equipmentSpecificMapper.getOneById(equipmentFireEquipmentList.get(0).getFireEquipmentId());
                 if (equipmentSpecific == null) {
-                    result.setMessage(ReserveEnum.NOFIRE.getText());
+                    result.setMessage("该预案保护的电力设备尚未绑定配套的火灾报警设备");
                     return result;
                 }