Forráskód Böngészése

fix: 修改房间列表报错的问题

luofeiyun 1 hónapja
szülő
commit
30b17ee290

+ 12 - 2
ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/room/ResourceRoomController.java

@@ -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);
     }