Browse Source

全部删除判断集合为空情况

hym 3 years ago
parent
commit
3e428a7c9e

+ 3 - 0
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/AlarmTypeServiceImpl.java

@@ -70,6 +70,9 @@ public class AlarmTypeServiceImpl implements AlarmTypeService {
         List<Integer>ids=new ArrayList<>();
         alarmTypeDtos.forEach(alarmTypeDto -> ids.add(alarmTypeDto.getId())
         );
+        if(CollectionUtils.isEmpty(ids)){
+            return 0;
+        }
         List<AlarmTypeDto>alarmTypes=alarmTypeMapper.selectTypesWithRules(ids);
         if(CollectionUtils.isEmpty(alarmTypes)){
             alarmTypeMapper.delete(ids);

+ 4 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeasurementSettlementServiceImpl.java

@@ -167,7 +167,10 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         measurementRecords.forEach(measurementSettlementDto -> {
             taskIds.add(measurementSettlementDto.getTaskId().intValue());
         });
-        xxlJobUtil.removeAll(taskIds);
+        if(!CollectionUtils.isEmpty(taskIds)){
+            xxlJobUtil.removeAll(taskIds);
+        }
+
     }