diff --git a/src/main/java/mjkf/xinke/main/service/DataService.java b/src/main/java/mjkf/xinke/main/service/DataService.java index 7dbbbd0..d642e62 100644 --- a/src/main/java/mjkf/xinke/main/service/DataService.java +++ b/src/main/java/mjkf/xinke/main/service/DataService.java @@ -38,7 +38,9 @@ public abstract class DataService, T> extends ServiceImp } }).collect(Collectors.toList()); for (T item : list) { - this.saveOrUpdateByIndex(item); + if (item != null) { + this.saveOrUpdateByIndex(item); + } } return list; } @@ -91,5 +93,6 @@ public abstract class DataService, T> extends ServiceImp // todo 排序 return result; } + abstract public LambdaQueryWrapper trendQuery(Object data, Integer year, Integer month); }