From f6d5e32bb44aa831cc185552f200a6f8ed023589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Thu, 8 May 2025 17:51:07 +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/service/impl/TbTowerServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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> 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> 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);