From 8806278fc9dd381047ec5bcfc1fb90b62794dc75 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 25 Apr 2025 13:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=9C=8B=E6=9D=BF-=E6=9D=86?= =?UTF-8?q?=E5=A1=94=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/entity/vo/ProTreeVo.java | 4 ++++ .../mappers/backstage/DigitalSignageMapper.xml | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProTreeVo.java b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProTreeVo.java index 3ed16ad..59ece34 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProTreeVo.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProTreeVo.java @@ -20,5 +20,9 @@ public class ProTreeVo { private String parentId; + private String lon; + + private String lat; + private List children; } diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index c2b6c18..f1681df 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -8,11 +8,15 @@ SELECT DISTINCT A.* FROM ( SELECT '0' AS id, '全部工程' AS title, - null AS parentId + null AS parentId, + null AS lon, + null AS lat UNION ALL SELECT CONCAT('departId-',td.id) AS id, td2.depart_name AS title, - '0' AS parentId + '0' AS parentId, + null AS lon, + null AS lat FROM tb_project tp LEFT JOIN tb_depart td ON tp.depart_id = td.id LEFT JOIN tb_depart td2 ON td.parent_id = td2.id @@ -28,7 +32,9 @@ UNION ALL SELECT tp.id, tp.pro_name AS title, - CONCAT('departId-',depart_id) AS parentId + CONCAT('departId-',depart_id) AS parentId, + tp.lon AS lon, + tp.lat AS lat FROM tb_project tp