|
@@ -618,8 +618,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
Map<Long, Contract> contractMap = contractList.stream().collect(Collectors.groupingBy(Contract::getId,
|
|
Map<Long, Contract> contractMap = contractList.stream().collect(Collectors.groupingBy(Contract::getId,
|
|
Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
|
|
Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
|
|
|
|
|
|
- List<EhsdPurchase> ehsdPurchaseList = ehsdPurchaseService.list(q -> q.in(EhsdPurchase::getDataResourceId, allContractIds)
|
|
|
|
- .in(EhsdPurchase::getStatus, 10, 30, 60, 70));
|
|
|
|
|
|
+ List<EhsdPurchase> ehsdPurchaseList = new ArrayList<>();
|
|
|
|
+ if (ObjectUtil.isNotEmpty(allContractIds)) {
|
|
|
|
+ ehsdPurchaseList = ehsdPurchaseService.list(q -> q.in(EhsdPurchase::getDataResourceId, allContractIds)
|
|
|
|
+ .in(EhsdPurchase::getStatus, 10, 30, 60, 70));
|
|
|
|
+ }
|
|
|
|
|
|
for (ContractBudgetVo contractBudgetVo : list) {
|
|
for (ContractBudgetVo contractBudgetVo : list) {
|
|
Long contractId = contractBudgetVo.getContractId();
|
|
Long contractId = contractBudgetVo.getContractId();
|