危险 修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -94,7 +94,6 @@ public class ZEngineeringDangerousController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
-        bo.setCreateTime(new Date());
         return toAjax(iZEngineeringDangerousService.updateByBo(bo));
     }
 

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

@@ -171,7 +171,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                         newPhoto.setFileName(pic.getName());
                         newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                         newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setCreateTime(update.getCreateTime());
                         newPhoto.setUpdateTime(new Date());
                         list.add(newPhoto);
                     }
@@ -185,7 +185,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                     photosToDelete.forEach(item->{
                         ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
                         zEngiineeringPhoto.setPicUrl(item);
-                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        zEngiineeringPhoto.setCreateTime(update.getCreateTime());
                         photoService.deleteWithValid(zEngiineeringPhoto);
                     });
                 }
@@ -283,12 +283,14 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
         int i = baseMapper.updateById(update);
-        if (i > 0) {
+        if (!ObjectUtils.isEmpty(bo.getFiles())) {
+            ZEngineeringDangerousVo queryById = this.queryById(bo.getId());
             List<ZEngiineeringPhoto> list = new ArrayList<>();
 
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
             bo1.setParentId(update.getId());
+            bo1.setCreateTime(queryById.getCreateTime());
             List<String> existingPhotos = photoService.queryList(bo1).stream()
                 .map(ZEngiineeringPhotoVo::getPicUrl)
                 .collect(Collectors.toList());
@@ -302,7 +304,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                     newPhoto.setFileName(pic.getName());
                     newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                    newPhoto.setCreateTime(bo.getCreateTime());
+                    newPhoto.setCreateTime(queryById.getCreateTime());
                     newPhoto.setUpdateTime(new Date());
                     list.add(newPhoto);
                 }
@@ -310,10 +312,10 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
 
             // 删除数据库中多余的文件
             List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getPics().stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList()).contains(pic))
+                .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
-                photosToDelete.forEach(item -> {
+                photosToDelete.forEach(item->{
                     ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
                     zEngiineeringPhoto.setPicUrl(item);
                     zEngiineeringPhoto.setCreateTime(bo.getCreateTime());