filter

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

@@ -67,7 +67,7 @@ public class SecurityStrategy implements FilterStrategy {
             return;
         }
         for (String cityCode : videoFilterCityTagIdMap.keySet()) {
-            Set<Long> result = videoCache.getUnchecked(cityCode);
+            videoCache.getUnchecked(cityCode);
         }
     }
 
@@ -88,11 +88,15 @@ public class SecurityStrategy implements FilterStrategy {
             return param.getVideoIds();
         }
 
-        if (CollectionUtils.isNotEmpty(excludeScenes)
-                && param.getHotSceneType() != null
-                && !excludeScenes.contains(param.getHotSceneType())
-                && MapUtils.isNotEmpty(videoFilterCityTagIdMap)
-                && videoFilterCityTagIdMap.containsKey(param.getCityCode())) {
+        if (CollectionUtils.isEmpty(excludeScenes)
+                || !CommonCollectionUtils.contains(excludeScenes, param.getHotSceneType())) {
+
+            if (MapUtils.isEmpty(videoFilterCityTagIdMap)
+                    || !videoFilterCityTagIdMap.containsKey(param.getCityCode())) {
+                return param.getVideoIds();
+            }
+
+
             Set<Long> filterVideos = videoCache.getUnchecked(param.getCityCode());
             if (CollectionUtils.isEmpty(filterVideos)) {
                 return param.getVideoIds();