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

test

See merge request !630

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

@@ -167,17 +167,19 @@ public class GroupChatPlanController {
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(1);
-        basePageInfo.setPageNum(10000);
+        basePageInfo.setPageSize(10000);
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> ownerResp = this.groupChatPlanApiService.listOwnerLogPage(planId, qdto, basePageInfo) ;
         if(ownerResp.isSuccess()) {
             List<GroupChatPlanOwnerLogDTO> list = ownerResp.getResult().getResult() ;
-            List<ChatOwnerVO> ownerList = list.stream().map(dto->{
-                ChatOwnerVO owner = new ChatOwnerVO();
-                owner.setStaffId(dto.getStaffId());
-                owner.setStaffName(dto.getStaffName());
-                return owner ;
-            }).collect(Collectors.toList()) ;
-            vo.setOwnerList(ownerList);
+            if(CollectionUtils.isNotEmpty(list)) {
+                List<ChatOwnerVO> ownerList = list.stream().map(dto->{
+                    ChatOwnerVO owner = new ChatOwnerVO();
+                    owner.setStaffId(dto.getStaffId());
+                    owner.setStaffName(dto.getStaffName());
+                    return owner ;
+                }).collect(Collectors.toList()) ;
+                vo.setOwnerList(ownerList);
+            }
         }
         return RestResponse.successResult(vo);
     }