#FIX

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -79,16 +79,16 @@ public class MercMiniDeviceController {
             //点位
             Long placeId = vo.getPlaceId();
             List<MercPlaceDto.Vo> merPlaceList = R.feignCheckData(mercPlaceService.list(new MercPlaceDto.ListDto().setIds(CollUtil.newArrayList(placeId))));
-            MercPlaceDto.Vo mercPlace = merPlaceList.get(0);
+            MercPlaceDto.Vo mercPlace = CollUtil.isNotEmpty(merPlaceList) ? merPlaceList.get(0) : null;
             vo.setPlaceName(mercPlace == null ? StrUtil.EMPTY : mercPlace.getPlaceName());
             //线路
             Long placeLineId = vo.getPlaceLineId();
             Map<Long, String> placeLineMap = R.feignCheckData(mercLineService.getNameList(new MercLineDto.GetNameListDto().setIds(CollUtil.newArrayList(placeLineId))));
-            vo.setPlaceLineName(placeLineMap.get(placeLineId));
+            vo.setPlaceLineName(CollUtil.isEmpty(placeLineMap) ? StrUtil.EMPTY : placeLineMap.get(placeLineId));
             //区域
             Long districtId = vo.getDistrictId();
             Map<Long, String> districtMap = R.feignCheckData(mercPlaceService.merReginId2Name(new MiniMercRegionDto.IdList().setIds(CollUtil.newArrayList(districtId))));
-            vo.setDistrictName(districtMap.get(districtId));
+            vo.setDistrictName(CollUtil.isEmpty(districtMap) ? StrUtil.EMPTY : districtMap.get(districtId));
         }
         return R.ok(vo);
     }