Merge branch 'feature/社群' into 'developer'

活码下群的下线

See merge request !787

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -272,6 +272,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             for(GroupChatDTO dto : list) {
                 if(null != offMap.get(dto.getGroupChatId())) {
                     dto.setOffTime( offMap.get(dto.getGroupChatId()));
+                    dto.setHmAddStatus(2);
                 }
             }
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -387,11 +387,13 @@ public class GroupChatHmController {
         ServiceResponse<Page<GroupChatDTO>> pageResp = this.groupChatApiService.listPage(qdto, basePageInfo);
         Page<GroupChatDTO> page = pageResp.getResult();
         List<GroupChatDTO> list = page.getResult();
-        list.stream().forEach(dto->{
-            if(dto.getTotalCount()>=200) {
-                dto.setHmAddStatus(2);
-            }
-        });
+        if(CollectionUtils.isNotEmpty(list)) {
+            list.stream().forEach(dto->{
+                if(dto.getTotalCount()>=200) {
+                    dto.setHmAddStatus(2);
+                }
+            });
+        }
         return RestResponse.successResult(page);
     }