From ba0d03f6fbc9fe9648aa867bbc6de2d0f656741b Mon Sep 17 00:00:00 2001
From: Liang <545073804@qq.com>
Date: Fri, 29 Mar 2024 18:55:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E5=88=86=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=93=E6=9E=9C=E5=87=BA=E5=8F=82=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/common/oss/entity/PartInfo.java | 2 ++
 .../org/dromara/system/service/impl/SysOssServiceImpl.java    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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());
         }