Merge branch 'refs/heads/dev-xym-cold-dnn' into pre-master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

@@ -265,7 +265,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             double originalScore = item.getLrScore();
             double calibratedScore = originalScore / (originalScore + (1 - originalScore) / negSampleRate);
             // 该创意尚未在模型中训练，打分不可靠
-            if (!DnnCidDataHelper.getCidSet().contains(item.getAdId())) {
+            if (CollectionUtils.isNotEmpty(DnnCidDataHelper.getCidSet()) && !DnnCidDataHelper.getCidSet().contains(item.getAdId())) {
                 Map<String, Map<String, String>> cidFeature = allCidFeature.getOrDefault(String.valueOf(item.getAdId()), new HashMap<>());
                 Map<String, String> b3Feature = cidFeature.getOrDefault("alg_cid_feature_cid_action", new HashMap<>());
                 double view = Double.parseDouble(b3Feature.getOrDefault("ad_view_14d", "0"));