diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
index 5fc7e4f4d..a698146e9 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
@@ -1078,7 +1078,7 @@ public class DeviceServiceImpl implements DeviceService {
         if(CollUtil.isNotEmpty(deviceModelAttributeDOPageResult)){
             List<String> typeNames = deviceModelAttributeDOPageResult.stream().map(DeviceContactModelDO::getTypeName).distinct().collect(Collectors.toList());
             List<String> codes = deviceModelAttributeDOPageResult.stream().map(DeviceContactModelDO::getAttributeCode).distinct().collect(Collectors.toList());
-            Map<String, List<DeviceContactModelDO>> resultMap = deviceModelAttributeDOPageResult.stream().collect(Collectors.groupingBy(DeviceContactModelDO::getTypeName));
+            Map<String, List<DeviceContactModelDO>> resultMap = deviceModelAttributeDOPageResult.stream().filter(d -> d.getTypeName() != null).collect(Collectors.groupingBy(DeviceContactModelDO::getTypeName));
             resultMap.forEach((key, value) -> {
                 HashMap<String, Object> objectObjectHashMap = new HashMap<>();
                 objectObjectHashMap.put("group", key);