From d3b9c13e63ecc334062fb4a71d1783eb4c2f3813 Mon Sep 17 00:00:00 2001 From: xudawei Date: Tue, 15 Apr 2025 20:59:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3540)=20=E6=9B=B4=E6=96=B0file?= =?UTF-8?q?=E4=B8=AD=E7=9A=84updateBy=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/service/metafile/impl/HandleFileService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/oss-service/src/main/java/cn/axzo/oss/service/metafile/impl/HandleFileService.java b/oss-service/src/main/java/cn/axzo/oss/service/metafile/impl/HandleFileService.java index 768543c..5a9a3f2 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/metafile/impl/HandleFileService.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/metafile/impl/HandleFileService.java @@ -96,8 +96,16 @@ public class HandleFileService extends WithFileService{ fileDao.save(ossFile); return ossFile; } else { - byFileUuid.setUpdateBy(dto.getUpdateBy()); - fileDao.saveOrUpdate(byFileUuid); + //1、入参updateBy不为空且db#file#updateBy不为空，且他们不相等 + //2、入参updateBy不为空且db#file#updateBy为空 + // 以上2个条件满足一个则更新db中的updateBy + if ((StringUtils.isNotBlank(dto.getUpdateBy()) + && StringUtils.isNotBlank(byFileUuid.getUpdateBy()) + && !Objects.equals(dto.getUpdateBy(), byFileUuid.getUpdateBy())) + || (StringUtils.isNotBlank(dto.getUpdateBy()) &&StringUtils.isBlank(byFileUuid.getUpdateBy()))) { + byFileUuid.setUpdateBy(dto.getUpdateBy()); + fileDao.saveOrUpdate(byFileUuid); + } } return byFileUuid; }