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 @@ - + 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)) {