From fcb0e1b2d6460f6fc5e7fa38d83601700e9b8595 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 27 May 2020 13:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/docker-compose-dev.yml             |  2 +-
 .../resi-group/resi-group-server/pom.xml      |  2 +-
 .../service/impl/ResiGroupServiceImpl.java    | 29 ++++++++++++++-----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 3dffe25c6d..309341c970 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.41
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.42
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 17ca3c48da..7276b170b8 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.41</version>
+    <version>0.3.42</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index d55917080d..8b7c28916d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -666,16 +666,29 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
 		formDTO.setPageNo(pageIndex);
 		List<ResiGroupEntity> list = baseDao.selectGroupsByGridId(formDTO);
-		list.stream().filter(group -> StringUtils.equals(ModuleConstant.GROUP_STATUS_APPROVED,group.getState())).collect(Collectors.toList()).forEach(i -> {
+		list.forEach(group -> {
 			//缓存中获取组信息
-			ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(i.getId());
+			ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
 			GroupsInGridResultDTO groupsInGridResultDTO = new GroupsInGridResultDTO();
-			groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId());
-			groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName());
-			groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());
-			groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
-			groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
-			groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
+			if (null == resiGroupInfoRedisDTO) {
+				if (MemberStateConstant.REJECTED.equals(group.getState())) {
+					groupsInGridResultDTO.setGroupId(group.getId());
+					groupsInGridResultDTO.setGroupName(group.getGroupName());
+					groupsInGridResultDTO.setGroupHeadPhoto(group.getGroupHeadPhoto());
+					groupsInGridResultDTO.setStatus(group.getState());
+					groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
+					groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
+				}
+
+			} else {
+				groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId());
+				groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName());
+				groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());
+				groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
+				groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
+				groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
+			}
+
 			resultList.add(groupsInGridResultDTO);
 		});