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

并发控制

See merge request !838

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

@@ -482,7 +482,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             if (CollectionUtils.isEmpty(staffList)) {
                 break;
             }
-            logger.info("查询staff表第{}页,共{}条", pageNum + 1, staffList.size());
+            logger.info("查询staff表第{}页,共{}条,{}", pageNum + 1, staffList.size(), wxEnterpriseId);
             List<String> userIdList = null;
             if (qwDTO.needOpenUserIdDk()) {
                 userIdList = staffList.stream().filter(dto -> StringUtils.isNotBlank(dto.getWxOpenUseId()))
@@ -565,6 +565,8 @@ public class GroupChatServiceImpl implements GroupChatService {
                     chat.setQuitCount(0);
                     chat.setQuitMemberCount(0);
                     this.groupChatMapper.insert(chat);
+                } else {
+                    groupChatId = groupChat.getGroupChatId();
                 }
                 RedisUtil.unlock(lockKey);
             } catch (Exception e) {