Merge branch 'developer_bw' of…

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -887,10 +887,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
 		qu.eq(WorkOrderPowerStation::getSequenceNbr, workOrderPowerStationId);
 		WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
+		PowerStationEngineeringInfoAllDto surveyInfoAllDto = new PowerStationEngineeringInfoAllDto();
+		if(Objects.isNull(workOrderPowerStation)){
+			return surveyInfoAllDto;
+		}
 		Long peasantHouseholdId = workOrderPowerStation.getPeasantHouseholdId();
 		Long workOrderId = workOrderPowerStation.getWorkOrderId();
 
-		PowerStationEngineeringInfoAllDto surveyInfoAllDto = new PowerStationEngineeringInfoAllDto();
 		PeasantHousehold peasantHousehold = new PeasantHousehold();
 
 		LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();