From a8ba074e4b0807cee707614a55e31e34ea0fbbde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 10:29:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
index bec79a9..47853a8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -10,9 +10,11 @@
import com.panzhihua.service_community.dao.ComMngCityDAO;
import com.panzhihua.service_community.dao.ComMngDistrictDAO;
import com.panzhihua.service_community.dao.ComMngProvinceDAO;
+import com.panzhihua.service_community.dao.ComMngStructAreaDAO;
import com.panzhihua.service_community.model.dos.ComMngCityDO;
import com.panzhihua.service_community.model.dos.ComMngDistrictDO;
import com.panzhihua.service_community.model.dos.ComMngProvinceDO;
+import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.ComMngProvinceService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,6 +36,8 @@
@Resource
private ComMngDistrictDAO comMngDistrictDAO;
+ @Resource
+ private ComMngStructAreaDAO comMngStructAreaDAO;
@Override
public R getProvince() {
@@ -80,7 +84,6 @@
List<ComMngAreaVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
ComMngAreaVO pvo = new ComMngAreaVO(p.getProvinceAdcode(), p.getProvinceName());
- vos.add(pvo);
List<ComMngCityDO> citys = cityDOS.stream().filter(city -> city.getProvinceAdcode().equals(p.getProvinceAdcode()) && city.getCityAdcode().equals(510400)).collect(Collectors.toList());
citys.forEach(c -> {
ComMngAreaVO cityVo = new ComMngAreaVO(c.getCityAdcode(), c.getCityName());
@@ -93,6 +96,7 @@
cityVo.getChildren().add(districtVo);
});
});
+ vos.add(pvo);
});
return R.ok(vos);
}
--
Gitblit v1.7.1