|
|
@@ -106,8 +106,18 @@ public class ResourceRoomController {
|
|
|
List<ResourceRoomModelDO> modelList = modelService.getList(modelIds);
|
|
|
Map<Long, ResourceRoomModelDO> longResourceRoomModelDOMap = CollectionUtils.convertMap(modelList, ResourceRoomModelDO::getId);
|
|
|
list.stream().forEach(item -> {
|
|
|
- item.setShipName(longResourceShipDOMap.get(item.getShipId()).getName());
|
|
|
- item.setRoomModelName(longResourceRoomModelDOMap.get(item.getRoomModelId()).getName());
|
|
|
+ ResourceShipDO resourceShipDO = longResourceShipDOMap.get(item.getShipId());
|
|
|
+ if(resourceShipDO != null) {
|
|
|
+ item.setShipName(resourceShipDO.getName());
|
|
|
+ }else {
|
|
|
+ item.setShipName("已删除");
|
|
|
+ }
|
|
|
+ ResourceRoomModelDO resourceRoomModelDO = longResourceRoomModelDOMap.get(item.getRoomModelId());
|
|
|
+ if(resourceRoomModelDO != null) {
|
|
|
+ item.setRoomModelName(resourceRoomModelDO.getName());
|
|
|
+ }else {
|
|
|
+ item.setRoomModelName("已删除");
|
|
|
+ }
|
|
|
});
|
|
|
return success(page);
|
|
|
}
|