From 2cd42f828bae400b49500e5be7f3b651b1cffda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 9 May 2025 17:29:44 +0800 Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../digitalSignage/basic/dao/TbCablewaTransMapper.java | 2 +- .../basic/service/impl/TbTowerServiceImpl.java | 10 +++++----- .../resources/mappers/basic/TbCablewaTransMapper.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java index 209fbf2..e64d501 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java @@ -15,5 +15,5 @@ public interface TbCablewaTransMapper { void delTbCablewaTrans(TbCablewaTransVo data); - TbCablewaTransVo getTbCablewaTransByTowerId(Long towerId); + List getTbCablewaTransByTowerId(Long towerId); } 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 f150059..18267cd 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 @@ -118,12 +118,12 @@ public class TbTowerServiceImpl implements TbTowerService { return ServerResponse.createErroe("请输入正确经纬度"); } TbTowerVo tbTower = tbTowerMapper.getTbTowerBySort(data); - if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){ + if (StringUtils.isNotNull(tbTower) && !data.getId().equals(tbTower.getId())){ return ServerResponse.createErroe("排序已存在"); } List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); - TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); - if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){ + List tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); + if(tbThreeSpanVo.size()>0 || tbCablewaTransVo.size()>0){ return ServerResponse.createErroe("修改失败-已有三跨点和索道点的杆塔不允许删除和修改"); } //如果改变杆塔类型，先删后加 @@ -161,8 +161,8 @@ public class TbTowerServiceImpl implements TbTowerService { public ServerResponse delTbTower(TbTowerVo data) { try { List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); - TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); - if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){ + List tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); + if(tbThreeSpanVo.size()>0 || tbCablewaTransVo.size()>0){ return ServerResponse.createErroe("删除失败-已有三跨点和索道点的杆塔不允许删除和修改"); } tbTowerMapper.delTbTower(data); diff --git a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml index f2bec4d..6a84d85 100644 --- a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml +++ b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml @@ -67,6 +67,6 @@ select tct.id as id,tct.pro_id as proId,tct.tower_id as towerId,tct.cableway_length as cablewayLength, tct.max_height as maxHeight,tct.safety_distance as safetyDistance,tct.max_slope as maxSlope, tct.create_user_id as createUserId - from tb_cablewa_trans tct where tct.tower_id = #{towerId} + from tb_cablewa_trans tct where tct.tower_id = #{towerId} and tct.is_active='1'