diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java index dd640da8398d4c8ed0e38f9e516b144a45df1c4f..f0a9dc42529bbd1ff750080b6f997030f7d05127 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java @@ -114,13 +114,15 @@ public class SiteTreeSelect implements Serializable { this.type = "site"; this.icon = "el-icon-wind-power"; this.detailAddress=collect.stream().map(item -> item.getDetailAddress()).collect(Collectors.joining(",")); - this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> ""); - this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> ""); + this.areaCode=collect.stream().map(item -> item.getAreaCode()).collect(Collectors.joining(",")); + this.longitude = collect.stream().map(item -> item.getLongitude()).collect(Collectors.joining(",")); + this.latitude = collect.stream().map(item -> item.getLatitude()).collect(Collectors.joining(",")); } else { this.id = entity.getIid(); this.label = entity.getName(); this.type = "area"; this.icon = "el-icon-place"; + this.areaCode=entity.getAreaCode(); } this.level=entity.getAreaLevel(); if ("False".equalsIgnoreCase(entity.getHaveSonArea())) {