From 1b8d5e165cf023d29d1319b7f32f02bb26b1678a Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Mon, 27 Sep 2021 22:39:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=80=BC?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=92=8C=E6=89=A9=E5=B1=95=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/flyfish/framework/beans/meta/SubBean.java | 2 ++
 .../com/flyfish/framework/service/impl/BaseServiceImpl.java | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
index 32d01f1..0ddac64 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
@@ -1,5 +1,6 @@
 package com.flyfish.framework.beans.meta;
 
+import javax.validation.Valid;
 import java.lang.annotation.*;
 
 /**
@@ -9,5 +10,6 @@ import java.lang.annotation.*;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Valid
 public @interface SubBean {
 }
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java b/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
index 9826c17..9d66666 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
@@ -300,9 +300,11 @@ public class BaseServiceImpl<T extends Domain> implements BaseService<T> {
             // 带有id的集合
             List<String> ids = entities.stream()
                     .filter(Objects::nonNull)
-                    .map(Domain::getId).collect(Collectors.toList());
+                    .map(Domain::getId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
             // 过滤不存在的记录
-            Map<String, T> savedMap = CollectionUtils.isEmpty(ids) ? ((List<T>) repository.findAllById(ids)).stream()
+            Map<String, T> savedMap = CollectionUtils.isNotEmpty(ids) ? ((List<T>) repository.findAllById(ids)).stream()
                     .collect(Collectors.toMap(Domain::getId, t -> t)) : Collections.emptyMap();
             List<T> updating = entities.stream()
                     .map(t -> {