|
@@ -156,10 +156,17 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
|
|
|
List<Integer>taskIds=new ArrayList<>();
|
|
|
ids.forEach(id->{
|
|
|
planIds.add(id.getId());
|
|
|
- taskIds.add(id.getTaskId().intValue());
|
|
|
+ Long taskId = id.getTaskId();
|
|
|
+ if(taskId!=null){
|
|
|
+ taskIds.add(taskId.intValue());
|
|
|
+ }
|
|
|
+
|
|
|
});
|
|
|
measurementSettlementMapper.deletePlan(planIds);
|
|
|
- xxlJobUtil.removeAll(taskIds);
|
|
|
+ if(!CollectionUtils.isEmpty(taskIds)){
|
|
|
+ xxlJobUtil.removeAll(taskIds);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|