瀏覽代碼

fixbug: 修复导入数据时,和数据库做校验

Scott 2 年之前
父節點
當前提交
6c9aa09348

+ 4 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/ExcelImportUtilService.java

@@ -161,7 +161,10 @@ public class ExcelImportUtilService<T extends Serializable, R extends Comparable
         //取出交集之后,要将相同数据的数据库id给新数据
         if (!CollectionUtils.isEmpty(collect)) {
             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()) {
                     T t = first.get();
                     item = process.apply(item, t);