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 implements BaseService { // 带有id的集合 List ids = entities.stream() .filter(Objects::nonNull) - .map(Domain::getId).collect(Collectors.toList()); + .map(Domain::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); // 过滤不存在的记录 - Map savedMap = CollectionUtils.isEmpty(ids) ? ((List) repository.findAllById(ids)).stream() + Map savedMap = CollectionUtils.isNotEmpty(ids) ? ((List) repository.findAllById(ids)).stream() .collect(Collectors.toMap(Domain::getId, t -> t)) : Collections.emptyMap(); List updating = entities.stream() .map(t -> {