item：应急处置完善角标信息

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

@@ -220,10 +220,10 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             instanceInfo.setId(batchNo);
             instanceInfo.setName(detail.getPlanName());
             instanceInfo.setOrgCode(detail.getOrgCode());
-            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(equipmentSpecific.getWarehouseStructureId());
-            if (warehouseStructure != null) {
-                instanceInfo.setPosition(warehouseStructure.getName());
-            }
+//            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(equipmentSpecific.getWarehouseStructureId());
+//            if (warehouseStructure != null) {
+//                instanceInfo.setPosition(warehouseStructure.getName());
+//            }
             contingencyInstanceInfoService.addDisposalDetails(instanceInfo);
             //  异步数据同步之消息发送
             planOperationRecordDataSync(record);
@@ -852,10 +852,12 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             PlanOperationRecord record = recordList.get(0);
             String batchNo = record.getBatchNo();
             ContingencyInstanceInfo instanceInfo = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
-            map.put("planName", instanceInfo.getName());
-            map.put("batchNo", batchNo);
-            List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1);
-            map.put("taskNum", list.size());
+            if (instanceInfo != null) {
+                map.put("planName", instanceInfo.getName());
+                map.put("batchNo", batchNo);
+                List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1);
+                map.put("taskNum", list.size());
+            }
         }
         return map;
     }