事件列表事件标签筛选调整

src/main/java/com/zhiwei/brandkbs2/controller/mobile/MobileEventController.java

@@ -70,7 +70,7 @@ public class MobileEventController extends BaseController {
             List<MarkerTag> tags = commonService.getQbjcTags(linkedGroupId, TagField.GROUP_NAME.is("情感倾向"));
             tags.forEach(tag -> {
                 if (tag.getName().equals(emotionName)) {
-                    dto.setEmotion(tag.getUniqueId());
+                    dto.setEmotions(Collections.singletonList(tag.getUniqueId()));
                 }
             });
         }

src/main/java/com/zhiwei/brandkbs2/controller/mobile/MobileSearchController.java

@@ -97,7 +97,7 @@ public class MobileSearchController {
             List<MarkerTag> tags = commonService.getQbjcTags(linkedGroupId, TagField.GROUP_NAME.is("情感倾向"));
             tags.forEach(tag -> {
                 if (tag.getName().equals(emotionName)) {
-                    dto.setEmotion(tag.getUniqueId());
+                    dto.setEmotions(Collections.singletonList(tag.getUniqueId()));
                 }
             });
         }

src/main/java/com/zhiwei/brandkbs2/dao/EventMiddlewareDao.java

@@ -31,12 +31,6 @@ public interface EventMiddlewareDao {
     PageData<EventListInfoVO> getEventListBrandkbs(BrandkbsEventSearchDTO dto);
 
     /**
-     * 按筛选条件获取事件列表-新
-     * @param dto
-     * @return
-     */
-    PageData<EventListInfoVO> getEventListBrandkbsNew(BrandkbsEventSearchDTO dto);
-    /**
      * 根据id删除事件
      * @param eventId
      * @return

src/main/java/com/zhiwei/brandkbs2/dao/impl/EventMiddlewareDaoImpl.java

@@ -48,11 +48,6 @@ public class EventMiddlewareDaoImpl implements EventMiddlewareDao {
     }
 
     @Override
-    public PageData<EventListInfoVO> getEventListBrandkbsNew(BrandkbsEventSearchDTO dto) {
-        return eventClient.getEventListBrandkbsNew(dto);
-    }
-
-    @Override
     public ReturnData deleteEvent(String eventId) {
         return eventClient.deleteEvent(eventId);
     }

src/main/java/com/zhiwei/brandkbs2/service/impl/EventServiceImpl.java

@@ -772,7 +772,7 @@ public class EventServiceImpl implements EventService {
         if (Constant.PRIMARY_CONTEND_ID.equals(dto.getBrandId())){
             dto.setBrandId(UserThreadLocal.getProjectId());
         }
-        return eventMiddlewareDao.getEventListBrandkbsNew(dto);
+        return eventMiddlewareDao.getEventListBrandkbs(dto);
     }
 
     @Override