From e5e511ab41934c30015a42f46bd440cdc2c6b413 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 02 三月 2022 17:18:05 +0800
Subject: [PATCH] Merge branch 'partyBuilding_lyq' into 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index e80ef41..64b4cdc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -180,9 +180,9 @@
* @return 社区集合 按照创建顺序倒序排列
*/
@Override
- public R listCommunityAll() {
+ public R listCommunityAll(String areaCode) {
List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0)
- .eq(ComActDO::getCityCode, "510400").orderByDesc(ComActDO::getCreateAt));
+ .eq(ComActDO::getAreaCode, areaCode).orderByDesc(ComActDO::getCreateAt));
List<ComActVO> comActVOS = new ArrayList<>();
if (!ObjectUtils.isEmpty(comActDOS)) {
comActDOS.forEach(comActDO -> {
@@ -221,8 +221,8 @@
}
@Override
- public R getWestCommunityLists() {
- return R.ok(this.comActDAO.getWestCommunityLists());
+ public R getWestCommunityLists(String areaCode) {
+ return R.ok(this.comActDAO.getWestCommunityLists(areaCode));
}
/**
@@ -231,9 +231,9 @@
* @return 社区列表
*/
@Override
- public R getCommunityAllList() {
+ public R getCommunityAllList(String areaCode) {
// 查询街道列表
- List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList();
+ List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(areaCode);
streetList.forEach(street -> {
// 查询街道下社区列表
List<CommunitySwitchAllAppletsVO> communityList =
@@ -256,8 +256,8 @@
* @return 社区列表
*/
@Override
- public R communitySwitchSearchList(String name) {
- return R.ok(this.comActDAO.getCommunityListByName(name));
+ public R communitySwitchSearchList(String name,String areaCode) {
+ return R.ok(this.comActDAO.getCommunityListByName(name,areaCode));
}
/**
--
Gitblit v1.7.1