From 9641ba3c1d91c3105966b2038f97a2db83bbe7b7 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 12 七月 2021 15:21:15 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index 2370ba7..c6376b6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -134,7 +134,30 @@
if(memberCascadeAddDTO.getType() == null){
return R.fail("参数错误");
}
- return R.ok(this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId()));
+ List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());
+
+ List<GridMemberCascadeVO> result = new ArrayList<>();
+ if(!memberCascadeList.isEmpty()){
+ memberCascadeList.forEach(cascade -> {
+ if(memberCascadeAddDTO.getType().equals(1)){//过滤无小区的社区
+ Integer count = this.baseMapper.getVillageCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else if(memberCascadeAddDTO.getType().equals(2)){//过滤无楼栋的小区
+ Integer count = this.baseMapper.getBuildingCount(cascade.getId());
+ if(count > 0){
+ result.add(cascade);
+ }
+ }else{
+ if(!cascade.getName().contains("栋")){
+ cascade.setName(cascade.getName() + "栋");
+ }
+ result.add(cascade);
+ }
+ });
+ }
+ return R.ok(result);
}
}
--
Gitblit v1.7.1