Merge branch 'ferture/四月迭代需求' into 'feature/自建应用验证'

Ferture/四月迭代需求

See merge request !1168

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

@@ -289,7 +289,11 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                 //do nothing
             } else {
                 logger.info("设置主门店并创建活码：manageFlag:{},staffId:{}", manageFlag, staffId);
-                clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+                TabHaobanClerkMainStoreRelated mainStore = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+                // 判断是主门店
+                if(null != mainStore && mainStore.getStoreId().equals(dto.getStoreId())) {
+                    this.clerkMainStoreRelatedService.reflushExternal(wxEnterpriseId, staffId);
+                }
                 //有活码权限的企业
                 boolean flag = rightService.hasRightForAdmin(enterpriseId, "hb_m0206");
                 if (flag) {

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

@@ -240,8 +240,8 @@ public class GroupChatController {
             sortColumn = "quit_member_count";
         }
         BasePageInfo basePageInfo = new BasePageInfo() ;
-        basePageInfo.setPageNum(qdto.getPageNum());
-        basePageInfo.setPageSize(qdto.getPageSize());
+        basePageInfo.setPageNum(1);
+        basePageInfo.setPageSize(99999);
         qdto.setSortColumn(sortColumn);
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());