From b2a268ff2923d00a1aa1e1543e323ca6124c3cf0 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Sat, 3 Feb 2024 22:01:30 +0800
Subject: [PATCH] =?UTF-8?q?patch:=20=E2=80=9C=E6=96=B0=E5=A2=9E=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E5=9B=BE=E6=8E=A5=E5=8F=A3=E2=80=9D=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BD=9C=E8=80=85=E7=9A=84=E5=AD=97=E6=AE=B5=E3=80=82?=
 =?UTF-8?q?=E8=80=8C=E4=B8=94=E8=BF=98=E6=98=AF=E5=8F=AF=E4=BB=A5=E5=A1=AB?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E5=A1=AB=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....xml => oa [clean,spring-boot_run].run.xml} |  3 ++-
 .../model/voData/business/info/CarouselVO.java |  1 +
 .../jsl/oa/services/impl/InfoServiceImpl.java  | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 rename .run/{oa [spring-boot_run].run.xml => oa [clean,spring-boot_run].run.xml} (83%)

diff --git a/.run/oa [spring-boot_run].run.xml b/.run/oa [clean,spring-boot_run].run.xml
similarity index 83%
rename from .run/oa [spring-boot_run].run.xml
rename to .run/oa [clean,spring-boot_run].run.xml
index f0ac702..afe71aa 100644
--- a/.run/oa [spring-boot_run].run.xml	
+++ b/.run/oa [clean,spring-boot_run].run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="oa [spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
+  <configuration default="false" name="oa [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
     <MavenSettings>
       <option name="myGeneralSettings" />
       <option name="myRunnerSettings" />
@@ -11,6 +11,7 @@
           </option>
           <option name="goals">
             <list>
+              <option value="clean" />
               <option value="spring-boot:run" />
             </list>
           </option>
diff --git a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java b/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
index abdfa1a..089b7b4 100644
--- a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
+++ b/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
@@ -17,6 +17,7 @@ import lombok.Data;
 public class CarouselVO {
     private Integer id;
     private Integer displayOrder;
+    private String author;
     private String image;
     private String title;
     private String description;
diff --git a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
index 7d48670..97ed9ed 100644
--- a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
@@ -49,6 +49,13 @@ public class InfoServiceImpl implements InfoService {
         UserDO userDO = userDAO.getUserById(userId);
         // 获取轮播图信息
         CarouselDO carouselDO = infoDAO.getCarousel();
+        // 检查轮播图是否手动设置作者
+        String author;
+        if (carouselVO.getAuthor() != null && !carouselVO.getAuthor().isEmpty()) {
+            author = carouselVO.getAuthor();
+        } else {
+            author = userDO.getUsername();
+        }
         // 添加轮播图
         CarouselDO.DataDO carousel = new CarouselDO.DataDO();
         carousel.setDisplayOrder(carouselVO.getDisplayOrder())
@@ -56,7 +63,7 @@ public class InfoServiceImpl implements InfoService {
                 .setDescription(carouselVO.getDescription())
                 .setTitle(carouselVO.getTitle())
                 .setIsActive(carouselVO.getIsActive())
-                .setAuthor(userDO.getUsername())
+                .setAuthor(author)
                 .setCreatedAt(new Timestamp(System.currentTimeMillis()).toString());
         carouselDO.getData().add(carousel);
         // 保存轮播图
@@ -80,13 +87,20 @@ public class InfoServiceImpl implements InfoService {
         if (carouselVO.getId() > carouselDO.getData().size()) {
             return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
         }
+        // 检查轮播图是否手动设置作者
+        String author;
+        if (carouselVO.getAuthor() != null) {
+            author = carouselVO.getAuthor();
+        } else {
+            author = userDO.getUsername();
+        }
         CarouselDO.DataDO carousel = carouselDO.getData().get(carouselVO.getId() - 1);
         carousel.setDisplayOrder(carouselVO.getDisplayOrder())
                 .setImage(carouselVO.getImage())
                 .setDescription(carouselVO.getDescription())
                 .setTitle(carouselVO.getTitle())
                 .setIsActive(carouselVO.getIsActive())
-                .setAuthor(userDO.getUsername())
+                .setAuthor(author)
                 .setUpdatedAt(new Timestamp(System.currentTimeMillis()).toString());
         // 保存轮播图
         if (infoDAO.setCarousel(carouselDO)) {