From 4b68eaa3e4d54ab8d73453d23c58f7b71842353f Mon Sep 17 00:00:00 2001
From: xiaozzzi <42293085+xiaozzzi@users.noreply.github.com>
Date: Sun, 7 Jan 2024 23:51:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E4=B8=8D=E4=BC=9A=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blossom/backend/server/picture/PictureService.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/picture/PictureService.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/picture/PictureService.java
index dc4332b..6646ff3 100644
--- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/picture/PictureService.java
+++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/picture/PictureService.java
@@ -178,7 +178,6 @@ public class PictureService extends ServiceImpl<PictureMapper, PictureEntity> {
 
         PictureEntity originPic;
         if ((originPic = baseMapper.selectByPathName(pic.getPathName())) != null) {
-
             // 如果允许重复上传, 则修改大小
             if (repeatUpload) {
                 PictureEntity upd = new PictureEntity();
@@ -187,12 +186,13 @@ public class PictureService extends ServiceImpl<PictureMapper, PictureEntity> {
                 upd.setCreTime(new Date());
                 baseMapper.updById(upd);
                 pic.setId(originPic.getId());
-                return pic;
+            } else {
+                throw new XzException400HTTP("图片[" + pic.getPathName() + "]已存在, 请重命名文件或选择其他路径!");
             }
-            throw new XzException400HTTP("图片[" + pic.getPathName() + "]已存在, 请重命名文件或选择其他路径!");
+        } else {
+            baseMapper.insert(pic);
         }
 
-        baseMapper.insert(pic);
         // 入库后进行文件上传操作
         try (InputStream inputStream = file.getInputStream()) {
             osManager.put(pic.getPathName(), inputStream);