diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java index 1162c80..f150059 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java @@ -123,7 +123,7 @@ public class TbTowerServiceImpl implements TbTowerService { } List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); - if(tbThreeSpanVo!=null || tbCablewaTransVo!=null){ + if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){ return ServerResponse.createErroe("修改失败-已有三跨点和索道点的杆塔不允许删除和修改"); } //如果改变杆塔类型,先删后加 @@ -162,7 +162,7 @@ public class TbTowerServiceImpl implements TbTowerService { try { List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); - if(tbThreeSpanVo!=null || tbCablewaTransVo!=null){ + if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){ return ServerResponse.createErroe("删除失败-已有三跨点和索道点的杆塔不允许删除和修改"); } tbTowerMapper.delTbTower(data);