From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +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 | 9 +++++----
1 files changed, 5 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 ce5aaf6..bec79a9 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngAreaVO;
@@ -36,7 +37,7 @@
@Override
public R getProvince() {
- List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(null);
+ List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(new LambdaQueryWrapper<>());
List<ComMngProvinceVO> vos = new ArrayList<>();
provinceDOS.forEach(p -> {
ComMngProvinceVO vo = new ComMngProvinceVO();
@@ -74,13 +75,13 @@
@Override
public R getCityTreeByProvinceCode(Integer provinceAdcode) {
List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(new QueryWrapper<ComMngProvinceDO>().lambda().eq(ComMngProvinceDO::getProvinceAdcode, provinceAdcode));
- List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(null);
- List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(null);
+ List<ComMngCityDO> cityDOS = comMngCityDAO.selectList(new QueryWrapper<>());
+ List<ComMngDistrictDO> districtDOS = comMngDistrictDAO.selectList(new QueryWrapper<>());
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())).collect(Collectors.toList());
+ 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());
BeanUtils.copyProperties(c, cityVo);
--
Gitblit v1.7.1