Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity

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

@@ -139,15 +139,15 @@ public class GroupChatActivityController {
         }
         //构建会员分组map
         List<Map<String, Object>> memberWeightViewList = Lists.newArrayList();
-        Map<String, Object> memberWeightView = Maps.newHashMap();
         List<GroupChatActivityJoinDTO> joinList = activityVO.getJoinList();
         if (CollectionUtils.isNotEmpty(joinList)) {
             for (GroupChatActivityJoinDTO joinDTO : joinList) {
+                Map<String, Object> memberWeightView = Maps.newHashMap();
                 Integer memberType = joinDTO.getMemberType();
                 // 会员信息
                 if (Objects.equals(memberType,0)) {
                     // 查询人群筛选器搜索条件主键ID
-                    memberWeightView.put("searchId", "GROUP_CHAT_SEARCH_ID_" + joinDTO.getChatActivityJoinId() + "-" + joinDTO.getIndex());
+                    memberWeightView.put("searchId", "GROUP_CHAT_SEARCH_ID_" + joinDTO.getChatActivityId() + "-" + joinDTO.getIndex());
                 } else if (Objects.equals(memberType,1)) {
                     // 会员分组
                     memberWeightView.put("tagGroupList", listMemberTagGroupInfoByGroupIds(joinDTO.getFilterJson()));