Browse Source

Merge branch 'dev_bugfix' into dev

dev_shibei_match
wangchao 5 years ago
parent
commit
3e6711e02e
  1. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

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

@ -675,6 +675,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
groupsInGridResultDTO.setStatus(group.getState());
groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
resultList.add(groupsInGridResultDTO);
} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
//缓存中获取组信息
ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
@ -684,9 +685,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
resultList.add(groupsInGridResultDTO);
}
resultList.add(groupsInGridResultDTO);
});
return new Result<List<GroupsInGridResultDTO>>().ok(resultList);

Loading…
Cancel
Save