更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -1651,10 +1651,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
     public EquipmentDetail getEquipmentDetailInfo(long id) {
         EquipmentDetail detail = equipmentDetailMapper.selectById(id);
+        if (ObjectUtils.isEmpty(detail.getManufacturerId())) {
+            detail.setManufacturerName("");
+            return detail;
+        }
         ManufacturerInfo info = manufacturerInfoMapper.selectById(detail.getManufacturerId());
         detail.setManufacturerName(info.getName());
-        return Optional.ofNullable(detail).orElse(new EquipmentDetail());
-
+        return Optional.ofNullable(detail).orElse(detail);
     }
 
     /**