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 309341c970..b07c33f2f7 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.42 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.43 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 7276b170b8..334f1cffde 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 @@ 4.0.0 - 0.3.42 + 0.3.43 com.epmet resi-group 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 8b7c28916d..72412d91cd 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 @@ -667,20 +667,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 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())) { + 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 { + } else if(MemberStateConstant.APPROVED.equals(group.getState())) { + //缓存中获取组信息 + ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId()); groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId()); groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName()); groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());