From 5f8378d67bc590fd10305ebc48fd68a87fb54742 Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 30 Nov 2023 16:57:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(material-task):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B7=B3=E8=BF=87=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mjkf/xinke/main/service/DataService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); }