瀏覽代碼

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
yumeng 4 年之前
父節點
當前提交
e18988e5ce

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -173,7 +173,7 @@ public class RuleKuaiShouPlanServiceImpl implements IRuleKuaiShouPlanService {
                 //未知优化目标数据存空
                 if(group.getOcpxActionType()!=0){
                     unit.setConvertNum(handleConvertNum(group.getOcpxActionType(),unitDetail));
-                    if(unit.getConvertNum()!=0){
+                    if(null!=unit.getConvertNum()&&unit.getConvertNum()!=0){
                         unit.setConvertCost(unitDetail.getBigDecimal("charge").divide(BigDecimal.valueOf(unit.getConvertNum()), 2, RoundingMode.HALF_UP));
                     }
                 }