本网格小组修改

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.42
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.43
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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.42</version>
+    <version>0.3.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -667,10 +667,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		formDTO.setPageNo(pageIndex);
 		List<ResiGroupEntity> list = baseDao.selectGroupsByGridId(formDTO);
 		list.forEach(group -> {
-			//缓存中获取组信息
-			ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
 			GroupsInGridResultDTO groupsInGridResultDTO = new GroupsInGridResultDTO();
-			if (null == resiGroupInfoRedisDTO) {
 			if (MemberStateConstant.REJECTED.equals(group.getState())) {
 					groupsInGridResultDTO.setGroupId(group.getId());
 					groupsInGridResultDTO.setGroupName(group.getGroupName());
@@ -678,9 +675,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					groupsInGridResultDTO.setStatus(group.getState());
 					groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
 					groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
-				}
+			} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
-
+				//缓存中获取组信息
-			} else {
+				ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
 				groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId());
 				groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName());
 				groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());