diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatChannel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatChannel.java index 76fccba..e59fd52 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatChannel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatChannel.java @@ -52,15 +52,19 @@ public class StatChannel { } for (ScheduleDetailsDto detail : list) { StatPreset the = null; + Integer presetId = detail.getPreset(); + if (presetId == null) { + presetId = 255; + } for (StatPreset item : presets) { - if (item.getPresetId().intValue() == detail.getPreset().intValue()) { + if (item.getPresetId().intValue() == presetId.intValue()) { the = item; break; } } if (the == null) { the = new StatPreset(); - the.setPresetId(detail.getPreset()); + the.setPresetId(presetId); the.setDelay(delay); presets.add(the); }