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