|
@@ -126,11 +126,16 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
|
|
|
|
|
|
/*获取meterTreeProjects差集*/
|
|
/*获取meterTreeProjects差集*/
|
|
List<MeterTreeProject> difference = meterTreeProjects.stream()
|
|
List<MeterTreeProject> difference = meterTreeProjects.stream()
|
|
- .filter(project -> meterTreeContracts.stream()
|
|
|
|
- .noneMatch(contract -> contract != null
|
|
|
|
- && ObjectUtil.isNotEmpty(contract.getSourceNodeId())
|
|
|
|
- && ObjectUtil.isNotEmpty(project.getId())
|
|
|
|
- && contract.getSourceNodeId().equals(project.getId())))
|
|
|
|
|
|
+ .filter(project ->
|
|
|
|
+ project != null &&
|
|
|
|
+ meterTreeContracts.stream()
|
|
|
|
+ .noneMatch(contract ->
|
|
|
|
+ contract != null
|
|
|
|
+ && ObjectUtil.isNotEmpty(contract.getSourceNodeId())
|
|
|
|
+ && ObjectUtil.isNotEmpty(project.getId())
|
|
|
|
+ && contract.getSourceNodeId().equals(project.getId())
|
|
|
|
+ )
|
|
|
|
+ )
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
/*原始数据类型*/
|
|
/*原始数据类型*/
|