Commit ece97f8e by 王祖波

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

parent 5e851d83
...@@ -132,15 +132,16 @@ public class JoinRuleManager { ...@@ -132,15 +132,16 @@ public class JoinRuleManager {
if (CollectionUtils.isNotEmpty(hmBOList)) { if (CollectionUtils.isNotEmpty(hmBOList)) {
return hmBOList; return hmBOList;
} }
} }else {
List<GroupChatActivityJoinDTO> joinList = activityHmQDTO.getChatActivity().getJoinList(); List<GroupChatActivityJoinDTO> joinList = activityHmQDTO.getChatActivity().getJoinList();
for (GroupChatActivityJoinDTO joinDTO : joinList) { for (GroupChatActivityJoinDTO joinDTO : joinList) {
boolean checked = checkActivityMember(chatActivity, joinDTO, inviteeMemberId); boolean checked = checkActivityMember(chatActivity, joinDTO, inviteeMemberId);
if (checked) { if (checked) {
logger.info("命中会员条件joinId:{},index:{}", joinDTO.getChatActivityJoinId(), joinDTO.getIndex()); logger.info("命中会员条件joinId:{},index:{}", joinDTO.getChatActivityJoinId(), joinDTO.getIndex());
GroupChatHmBO chatHm = groupChatHmService.getById(joinDTO.getChatHmId()); GroupChatHmBO chatHm = groupChatHmService.getById(joinDTO.getChatHmId());
if (chatHm != null && Objects.equals(chatHm.getStatusFlag(), 1)) { if (chatHm != null && Objects.equals(chatHm.getStatusFlag(), 1)) {
return Lists.newArrayList(chatHm); 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