Merge branch 'dev_group0329' into dev_temp

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

@@ -112,6 +112,11 @@ public class ExitGroupServiceImpl implements ExitGroupService {
                 resiTopicOperationService.insertBatch(list);
             }
         }
+        //去重
+        if(delIdList.size()>NumConstant.ZERO){
+            delIdList = delIdList.stream().distinct().collect(Collectors.toList());
+        }
+        int count = delIdList.size();
 
         //3.判断是否屏蔽本小组内历史评论
         if ("yes".equals(formDTO.getShieldFlag())) {
@@ -167,6 +172,7 @@ public class ExitGroupServiceImpl implements ExitGroupService {
             throw new RenException("未查询到群组统计数据，删除失败");
         }
         statisticalEntity.setTotalMembers(statisticalEntity.getTotalMembers() - 1);
+        statisticalEntity.setTotalTopics(statisticalEntity.getTotalTopics()-count);
         statisticalEntity.setTotalNormalMemebers(statisticalEntity.getTotalNormalMemebers() - 1);
         roleList.forEach(r -> {
             if ("partymember".equals(r.getRoleKey())) {//党员总数减一