Parcourir la source

返回数据修改

hym il y a 3 ans
Parent
commit
a683914f58

+ 9 - 2
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeasurementSettlementServiceImpl.java

@@ -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