diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index a73797e8..0b0500d7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -305,8 +305,12 @@ public class DepotHeadService { public Map getFinishDepositMapByNumberList(List numberList) { List list = depotHeadMapperEx.getFinishDepositByNumberList(numberList); Map finishDepositMap = new HashMap<>(); - for(FinishDepositVo finishDepositVo : list){ - finishDepositMap.put(finishDepositVo.getNumber(), finishDepositVo.getFinishDeposit()); + if(list!=null && list.size()>0) { + for (FinishDepositVo finishDepositVo : list) { + if(finishDepositVo!=null) { + finishDepositMap.put(finishDepositVo.getNumber(), finishDepositVo.getFinishDeposit()); + } + } } return finishDepositMap; } @@ -314,8 +318,12 @@ public class DepotHeadService { public Map getBillSizeMapByLinkNumberList(List numberList) throws Exception { List list = getBillListByLinkNumberList(numberList); Map billListMap = new HashMap<>(); - for(DepotHead depotHead : list){ - billListMap.put(depotHead.getLinkNumber(), list.size()); + if(list!=null && list.size()>0) { + for (DepotHead depotHead : list) { + if(depotHead!=null) { + billListMap.put(depotHead.getLinkNumber(), list.size()); + } + } } return billListMap; } @@ -323,8 +331,12 @@ public class DepotHeadService { public Map getFinancialBillNoMapByBillIdList(List idList) { List list = accountHeadService.getFinancialBillNoByBillIdList(idList); Map billListMap = new HashMap<>(); - for(AccountItem accountItem : list){ - billListMap.put(accountItem.getBillId(), list.size()); + if(list!=null && list.size()>0) { + for (AccountItem accountItem : list) { + if(accountItem!=null) { + billListMap.put(accountItem.getBillId(), list.size()); + } + } } return billListMap; }