zhaowenrui преди 1 година
родител
ревизия
04874f05cb
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

+ 2 - 2
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

@@ -160,7 +160,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
 
             // 插入前端传来的新文件
             for (ZFileBo pic : bo.getFiles()) {
-                if (!existingPhotos.contains(pic)) {
+                if (!existingPhotos.contains(pic.getUrl())) {
                     ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
                     newPhoto.setParentId(bo.getId());
                     newPhoto.setPicUrl(pic.getUrl());
@@ -173,7 +173,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
 
             // 删除数据库中多余的文件
             List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getFiles().contains(pic))
+                .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
                 photosToDelete.forEach(item->{