diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java index 107ca56..8499b86 100644 --- a/src/main/java/common/service/impl/ContractServiceImpl.java +++ b/src/main/java/common/service/impl/ContractServiceImpl.java @@ -1856,11 +1856,19 @@ public class ContractServiceImpl implements ContractService { return list; } - Map<String, String> dicdata = contractRepository.findByContractCode( - codesList).stream(). - collect(Collectors.toMap(p -> p[0].toString(), p -> p[nextIndex].toString(), (key1, key2) -> key1)); + List<Object[]> contactdata = contractRepository.findByContractCode(codesList); + + if(contactdata!=null){ + Map<String, String> dicdata =contactdata.stream(). + collect(Collectors.toMap(p -> p[0].toString(), p -> p[nextIndex].toString(), (key1, key2) -> key1)); + + return list.stream().filter(p -> authdata.get(dicdata.get(p.getContractCode())) == null ? false : true).collect(Collectors.toList()); + + }else{ + return list; + } + - return list.stream().filter(p -> authdata.get(dicdata.get(p.getContractCode())) == null ? false : true).collect(Collectors.toList()); }