From 7bfa6a85ad6a6c537b0f7ddb9f6a8795c8e8c866 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 09 六月 2022 16:44:24 +0800
Subject: [PATCH] 五社&社区企业&人大代表
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 1e3589f..554a02d 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
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.utlis.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -79,7 +80,7 @@
}
@Override
- public R getCityTreeByProvinceCode(Integer provinceAdcode) {
+ public R getCityTreeByProvinceCode(Integer provinceAdcode, String areaCode) {
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(
new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
@@ -94,9 +95,14 @@
ComMngAreaVO cityVo = new ComMngAreaVO(c.getCityAdcode(), c.getCityName());
BeanUtils.copyProperties(c, cityVo);
pvo.getChildren().add(cityVo);
- List<ComMngDistrictDO> districts =
- districtDOS.stream().filter(district -> district.getCityAdcode().equals(c.getCityAdcode()))
- .collect(Collectors.toList());
+ List<ComMngDistrictDO> districts;
+ if (StringUtils.isNotEmpty(areaCode)) {
+ districts = districtDOS.stream().filter(district -> district.getCityAdcode()
+ .equals(c.getCityAdcode()) && district.getDistrictAdcode().toString().equals(areaCode)).collect(Collectors.toList());
+ } else {
+ districts = districtDOS.stream().filter(district -> district.getCityAdcode().equals(c.getCityAdcode()))
+ .collect(Collectors.toList());
+ }
districts.forEach(d -> {
ComMngAreaVO districtVo = new ComMngAreaVO(d.getDistrictAdcode(), d.getDistrictName());
BeanUtils.copyProperties(d, districtVo);
--
Gitblit v1.7.1