Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -151,7 +151,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         KeywordsVO keywordsVO = new KeywordsVO();
         List<KeywordsVO> keywordsVOS = keyWordsService.keywordInfoByEventIdList(eventId);
         keywordsVOS.stream().filter(f -> StrUtil.equals(f.getBindingType(),"1")).findFirst().ifPresent(f -> keywordsVO.setKeyword(f.getKeyword()));
-        keywordsVOS.stream().filter(f -> StrUtil.equals(f.getBindingType(),"3")).findFirst().ifPresent(f -> keywordsVO.setExclusionWord(f.getExclusionWord()));
+        keywordsVOS.stream().filter(f -> StrUtil.equals(f.getBindingType(),"3")).findFirst().ifPresent(f -> keywordsVO.setExclusionWord(f.getKeyword()));
         eventVO.setKeywordsVO(keywordsVO);
         return eventVO;
     }