From a26fbb6a4a275294947b8f7d286eb7721af06f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Wed, 7 May 2025 12:09:38 +0800
Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E4=BA=86=E4=B8=A4=E4=B8=AA=E6=9D=86=E5=A1=94G=EF=BC=8C?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8A=E5=81=9A=E4=BA=86=E6=95=B0=E6=8D=AE=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=97=B6=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E5=81=9A=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/TbProjectServiceImpl.java            | 6 ++++--
 .../resources/mappers/backstage/DigitalSignageMapper.xml    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
index c9a1c20..9a2de57 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java
@@ -170,7 +170,9 @@ public class TbProjectServiceImpl implements TbProjectService {
      */
     @Override
     public List<TbProjectVo> tbProjectExport(TbProjectVo data) {
-            List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
-            return tbProjectVoList;
+        List<Long> deptIds = UserUtil.getLoginUser().getDeparts();
+        data.setDeptIds(deptIds);
+        List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
+        return tbProjectVoList;
     }
 }
diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
index 2b6a9f1..d766245 100644
--- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
+++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml
@@ -85,7 +85,7 @@
                tts.highway_width AS highwayWidth
         FROM tb_three_span tts
         LEFT JOIN tb_tower tt ON tts.tower_id = tt.id
-        LEFT JOIN tb_tower tt2 ON tts.tower_id = tt2.id
+        LEFT JOIN tb_tower tt2 ON tts.next_tower_id = tt2.id
         WHERE tts.pro_id = #{id} AND is_active = '1'
     </select>
     <!--查询索道运输信息-->