|
@@ -161,7 +161,10 @@ public class ExcelImportUtilService<T extends Serializable, R extends Comparable
|
|
|
//取出交集之后,要将相同数据的数据库id给新数据
|
|
//取出交集之后,要将相同数据的数据库id给新数据
|
|
|
if (!CollectionUtils.isEmpty(collect)) {
|
|
if (!CollectionUtils.isEmpty(collect)) {
|
|
|
collect = collect.stream().map(item -> {
|
|
collect = collect.stream().map(item -> {
|
|
|
- Optional<T> first = dbExistsList.stream().filter(o -> ObjectUtils.nullSafeEquals(mapper, mapper)).findFirst();
|
|
|
|
|
|
|
+ T item2 = item;
|
|
|
|
|
+ Optional<T> first = dbExistsList.stream()
|
|
|
|
|
+ .filter(o ->
|
|
|
|
|
+ ObjectUtils.nullSafeEquals(mapper.apply(item2), mapper.apply(o))).findFirst();
|
|
|
if (first.isPresent()) {
|
|
if (first.isPresent()) {
|
|
|
T t = first.get();
|
|
T t = first.get();
|
|
|
item = process.apply(item, t);
|
|
item = process.apply(item, t);
|