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 tbProjectExport(TbProjectVo data) { - List tbProjectVoList = tbProjectMapper.getTbProjectList(data); - return tbProjectVoList; + List deptIds = UserUtil.getLoginUser().getDeparts(); + data.setDeptIds(deptIds); + List 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'