diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index f3858b396..e4f4d0534 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -837,7 +837,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb */ private String getCountryCodeByName(String name){ - EmisCountry country=getCountryByName(name); if(country!=null){ return country.getCode(); @@ -2836,10 +2835,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } } - if(feeItem.getFee().compareTo(BigDecimal.ZERO)!=0) { - // 记录类型,用于判断是否重复 - feeTypeMap.put(feeItem.getFeeCode(),1); - feeList.add(feeItem); + if(feeItem!=null) { + if (feeItem.getFee().compareTo(BigDecimal.ZERO) != 0) { + // 记录类型,用于判断是否重复 + feeTypeMap.put(feeItem.getFeeCode(), 1); + feeList.add(feeItem); + } } }