Commit ece97f8e by 王祖波

受邀人没有memberId则取邀请人所在群的群活码

parent 5e851d83
......@@ -132,15 +132,16 @@ public class JoinRuleManager {
if (CollectionUtils.isNotEmpty(hmBOList)) {
return hmBOList;
}
}
List<GroupChatActivityJoinDTO> joinList = activityHmQDTO.getChatActivity().getJoinList();
for (GroupChatActivityJoinDTO joinDTO : joinList) {
boolean checked = checkActivityMember(chatActivity, joinDTO, inviteeMemberId);
if (checked) {
logger.info("命中会员条件joinId:{},index:{}", joinDTO.getChatActivityJoinId(), joinDTO.getIndex());
GroupChatHmBO chatHm = groupChatHmService.getById(joinDTO.getChatHmId());
if (chatHm != null && Objects.equals(chatHm.getStatusFlag(), 1)) {
return Lists.newArrayList(chatHm);
}else {
List<GroupChatActivityJoinDTO> joinList = activityHmQDTO.getChatActivity().getJoinList();
for (GroupChatActivityJoinDTO joinDTO : joinList) {
boolean checked = checkActivityMember(chatActivity, joinDTO, inviteeMemberId);
if (checked) {
logger.info("命中会员条件joinId:{},index:{}", joinDTO.getChatActivityJoinId(), joinDTO.getIndex());
GroupChatHmBO chatHm = groupChatHmService.getById(joinDTO.getChatHmId());
if (chatHm != null && Objects.equals(chatHm.getStatusFlag(), 1)) {
return Lists.newArrayList(chatHm);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment