Skip to content

A
amos-boot-biz
Commit 0856f9ed authored by KeYong's avatar KeYong
Browse files
Options

更新

parent 95140065
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ 0856f9ed
...@@ -1651,10 +1651,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1651,10 +1651,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
public EquipmentDetail getEquipmentDetailInfo(long id) { public EquipmentDetail getEquipmentDetailInfo(long id) {
EquipmentDetail detail = equipmentDetailMapper.selectById(id); EquipmentDetail detail = equipmentDetailMapper.selectById(id);
if (ObjectUtils.isEmpty(detail.getManufacturerId())) {
detail.setManufacturerName("");
return detail;
}
ManufacturerInfo info = manufacturerInfoMapper.selectById(detail.getManufacturerId()); ManufacturerInfo info = manufacturerInfoMapper.selectById(detail.getManufacturerId());
detail.setManufacturerName(info.getName()); detail.setManufacturerName(info.getName());
return Optional.ofNullable(detail).orElse(new EquipmentDetail()); return Optional.ofNullable(detail).orElse(detail);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment