From a75811ca299e0e06b4dbd5f5f074c59a1f0eb709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 29 Apr 2025 16:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../digitalSignage/basic/controller/TbTowerController.java      | 2 +-
 .../digitalSignage/basic/service/impl/TbTowerServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
index 174819d..0e4c8d0 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
@@ -155,6 +155,6 @@ public class TbTowerController {
         }
         TbTowerVo tbTowerVo = FastJsonHelper.jsonStrToBean(params, TbTowerVo.class);
         String message = tbTowerService.tbTowerExport(tbTowerVoList, tbTowerVo);
-        return ServerResponse.createSuccess(message);
+        return ServerResponse.createBySuccessMsg(message);
     }
 }
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 bb31cae..7bc1d74 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
@@ -114,7 +114,7 @@ public class TbTowerServiceImpl implements TbTowerService {
                 return ServerResponse.createErroe("排序已存在");
             }
             //如果改变杆塔类型，先删后加
-            if (tbTower.getUploadType()!=data.getUploadType()){
+            if (StringUtils.isNotNull(tbTower) && tbTower.getUploadType()!=data.getUploadType()){
                 delTbTower(data);
                 addTbTower(data);
             }else {