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 b27ed2854..4b6b25fc6 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 @@ -278,21 +278,23 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 加入 // b.CODE AS countryCode, // b.NAME AS countryName, - Map otherCountryItemMap = new HashMap<>(); - otherCountryItemMap.put("countryCode","-1"); - otherCountryItemMap.put("countryName","其它国家"); - otherCountryItemMap.put("orderNum",99); + if(otherTotalNum>0) { + Map otherCountryItemMap = new HashMap<>(); + otherCountryItemMap.put("countryCode", "-1"); + otherCountryItemMap.put("countryName", "其它国家"); + otherCountryItemMap.put("orderNum", 99); - otherCountryItemMap.put("kdTotalNum",otherKdTotalNum); - otherCountryItemMap.put("kyTotalNum",otherKyTotalNum); - otherCountryItemMap.put("wlTotalNum",otherWlTotalNum); - otherCountryItemMap.put("totalNum",otherTotalNum); + otherCountryItemMap.put("kdTotalNum", otherKdTotalNum); + otherCountryItemMap.put("kyTotalNum", otherKyTotalNum); + otherCountryItemMap.put("wlTotalNum", otherWlTotalNum); + otherCountryItemMap.put("totalNum", otherTotalNum); - otherCountryItemMap.put("kdTotalBillWeight",otherKdTotalBillWeight); - otherCountryItemMap.put("kyTotalBillWeight",otherKyTotalBillWeight); - otherCountryItemMap.put("wlTotalBillWeight",otherWlTotalBillWeight); - otherCountryItemMap.put("totalBillWeight",otherTotalBillWeight); - mySortList.add(otherCountryItemMap); + otherCountryItemMap.put("kdTotalBillWeight", otherKdTotalBillWeight); + otherCountryItemMap.put("kyTotalBillWeight", otherKyTotalBillWeight); + otherCountryItemMap.put("wlTotalBillWeight", otherWlTotalBillWeight); + otherCountryItemMap.put("totalBillWeight", otherTotalBillWeight); + mySortList.add(otherCountryItemMap); + } } // 排序