Merge branch 'master' into feature_20240424_zhaohaipeng_content_security_v2

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java

@@ -71,6 +71,7 @@ public abstract class AbstractFilterService {
         } else {
             videoIds = filterByViewed(param, videoIds);
         }
+//        log.info("viewFilterOld after {}", JSONUtils.toJson(videoIds));
         return videoIds;
     }
 
@@ -96,9 +97,11 @@ public abstract class AbstractFilterService {
     }
 
     private List<Long> filterByViewedConcurrent(FilterParam param, List<Long> videoIds) {
-        // TODO uid为空时，还需要过滤么？
-        if (StringUtils.isBlank(param.getMid())
-                || CollectionUtils.isEmpty(videoIds)) {
+//        if (StringUtils.isBlank(param.getMid())
+//                || CollectionUtils.isEmpty(videoIds)) {
+//            return videoIds;
+//        }
+        if (CollectionUtils.isEmpty(videoIds)) {
             return videoIds;
         }
 
@@ -144,8 +147,11 @@ public abstract class AbstractFilterService {
 
     private List<Long> filterByViewed(FilterParam param, List<Long> videoIds) {
         // TODO uid为空时，还需要过滤么？
-        if (StringUtils.isBlank(param.getMid())
-                || CollectionUtils.isEmpty(videoIds)) {
+//        if (StringUtils.isBlank(param.getMid())
+//                || CollectionUtils.isEmpty(videoIds)) {
+//            return videoIds;
+//        }
+        if (CollectionUtils.isEmpty(videoIds)) {
             return videoIds;
         }
         return viewedService.filterViewedVideo(param.getAppType(), param.getMid(), param.getUid(), videoIds, param.getCityCode(),