|
@@ -249,12 +249,24 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
log.warn("判断规则组({}),账户规则不符合", ruleGroup.getId());
|
|
log.warn("判断规则组({}),账户规则不符合", ruleGroup.getId());
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+ if (Check.isNull(accountDatas)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
} else if ("plan".equals(ruleBase.getRuleDimension())) {
|
|
} else if ("plan".equals(ruleBase.getRuleDimension())) {
|
|
planDatas = getOKData(planDatas, dimensionData, ruleBase, dataType, threshold);
|
|
planDatas = getOKData(planDatas, dimensionData, ruleBase, dataType, threshold);
|
|
|
|
+ if (Check.isNull(planDatas)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
} else if ("creative".equals(ruleBase.getRuleDimension())) {
|
|
} else if ("creative".equals(ruleBase.getRuleDimension())) {
|
|
creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, dataType, threshold);
|
|
creativeDatas = getOKData(creativeDatas, dimensionData, ruleBase, dataType, threshold);
|
|
|
|
+ if (Check.isNull(creativeDatas)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
} else if ("target".equals(ruleBase.getRuleDimension())) {
|
|
} else if ("target".equals(ruleBase.getRuleDimension())) {
|
|
targetDatas = getOKData(targetDatas, dimensionData, ruleBase, dataType, threshold);
|
|
targetDatas = getOKData(targetDatas, dimensionData, ruleBase, dataType, threshold);
|
|
|
|
+ if (Check.isNull(targetDatas)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|