diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/PartInfo.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/PartInfo.java index 4a6d621c8..8d89ac7e5 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/PartInfo.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/PartInfo.java @@ -2,6 +2,7 @@ package org.dromara.common.oss.entity; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.io.Serializable; * * @author SunnyDeer0911 */ +@NoArgsConstructor @AllArgsConstructor @Data public class PartInfo implements Serializable { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 53c882ec5..fbe8a2a93 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -302,7 +302,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService { oss.setUrl(partUploadInfo.getUrl()); baseMapper.insert(oss); } - return MapstructUtils.convert(partUploadInfo, SysOssPartUploadVo.class); + SysOssPartUploadVo sysOssPartUploadVo = MapstructUtils.convert(partUploadInfo, SysOssPartUploadVo.class); + sysOssPartUploadVo.setMergeCompleted(partUploadInfo.isNeedMerge()); + return sysOssPartUploadVo; } catch (Exception e) { throw new ServiceException(e.getMessage()); }