Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 1325922b by huangjy
Options

fix：修复bug

parent 2c1aa1f7
Inline Side-by-side
Showing with 3 additions and 2 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
...@@ -280,7 +280,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev ...@@ -280,7 +280,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
PlatDeviceViewVO vo = BeanDtoVoUtils.convert(db, PlatDeviceViewVO.class); PlatDeviceViewVO vo = BeanDtoVoUtils.convert(db, PlatDeviceViewVO.class);
PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda() PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
.eq(PlatDeviceOther::getDeviceId, id)); .eq(PlatDeviceOther::getDeviceId, id).last("limit 1"));
if (other != null) { if (other != null) {
BeanUtils.copyProperties(other, vo); BeanUtils.copyProperties(other, vo);
...@@ -303,7 +303,8 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev ...@@ -303,7 +303,8 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
PlatDeviceViewVO vo = BeanDtoVoUtils.convert(platDevice, PlatDeviceViewVO.class); PlatDeviceViewVO vo = BeanDtoVoUtils.convert(platDevice, PlatDeviceViewVO.class);
PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda() PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
.eq(PlatDeviceOther::getDeviceId, platDevice.getId())); .eq(PlatDeviceOther::getDeviceId, platDevice.getId())
.last("limit 1"));
if (other != null) { if (other != null) {
BeanUtils.copyProperties(other, vo); BeanUtils.copyProperties(other, vo);
......
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 sign in to comment