From 6278a11e191892ae672eba0dce6d8990283327a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 22 Jul 2021 17:52:38 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
index 83e23db..1ec0f36 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java
@@ -41,17 +41,26 @@
@Override
public List<Map<String, Object>> getMapPath(Integer orgId) {
- //������������id������������������
QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("province_code", "city_code", "area_code")
.eq("organization_id", orgId)
.eq("is_delete", Constants.NOT_DELETE);
+ //������������id������������������
List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryWrapper);
Set<Integer> cityCodes = new HashSet<>();
for (MonitorPoint monitorPoint : monitorPoints) {
- cityCodes.add(monitorPoint.getProvinceCode());
- cityCodes.add(monitorPoint.getCityCode());
- cityCodes.add(monitorPoint.getAreaCode());
+ Integer provinceCode = monitorPoint.getProvinceCode();
+ Integer cityCode = monitorPoint.getCityCode();
+ Integer areaCode = monitorPoint.getAreaCode();
+ if (provinceCode != null) {
+ cityCodes.add(provinceCode);
+ }
+ if (cityCode != null) {
+ cityCodes.add(cityCode);
+ }
+ if (areaCode != null) {
+ cityCodes.add(areaCode);
+ }
}
QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
@@ -76,7 +85,7 @@
return newList;
}
- //������������������������������������
+ //������������������������
private List<Map<String, Object>> getAreasByRecursion(SysArea sysArea, List<SysArea> sysAreas) {
SysArea newSysArea = new SysArea();
newSysArea.setParentCode(sysArea.getAreaCode());
--
Gitblit v1.8.0