bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
马三炮 2025-04-25 13:47:07 +08:00
parent 351c84f002 8806278fc9
commit 507b2b8ce6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProTreeVo.java
View File

@ -20,5 +20,9 @@ public class ProTreeVo {
private String parentId;
private String lon;
private String lat;
private List<ProTreeVo> children;
}

12
src/main/resources/mappers/backstage/DigitalSignageMapper.xml
View File

@ -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
<where>
<if test="level != '1' and departs != null and departs.size() > 0">