From 4211bce256884cb46698699b841f7a6217056980 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Fri, 28 Jun 2024 15:45:39 +0800
Subject: [PATCH] BUGFIX:aida;

---
 .../com/ai/da/model/dto/DesignCollectionPrintElementDTO.java   | 2 ++
 .../com/ai/da/service/impl/CollectionElementServiceImpl.java   | 3 +++
 src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java
index 18853d95..50d4f679 100644
--- a/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java
+++ b/src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java
@@ -14,6 +14,8 @@ public class DesignCollectionPrintElementDTO {
     @ApiModelProperty("design类型 用户design生成时候区别library和collection")
     private String designType;
 
+    private String level2Type;
+
     @ApiModelProperty("是否pin 1 pin 0 不pin")
     private Byte isPin;
 
diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
index 3fd813e2..b1f1156e 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -668,6 +668,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
             Generate byId = generateService.getById(o.getGenerateId());
             d.setAccountId(byId.getAccountId());
             d.setLevel1Type(byId.getLevel1Type());
+            if (!StringUtils.isEmpty(byId.getLevel2Type())) {
+                d.setLevel2Type(byId.getLevel2Type());
+            }
             d.setCreateDate(Date.from(o.getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
             if (null != idToMap) {
                 DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId());
diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
index 3e0a3554..fb7a43f3 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -398,6 +398,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
                 vo.setCanvasUrl(minioUtil.getPresignedUrl(canvas.getUrl(), 24 * 60));
                 vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
                 vo.setViewNums(redisUtil.getViewCount(vo.getId()));
+                Long accountId = vo.getAccountId();
+                vo.setUserName(accountMapper.selectById(accountId).getUserName());
                 return vo;
             }
             return null;
@@ -492,6 +494,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         designMapper.insert(design);
 
         userLikeGroupNew.setCollectionId(collectionIdNew);
+        userLikeGroupNew.setCreateDate(new Date());
         userLikeGroupMapper.insert(userLikeGroupNew);
 //        List<TCollectionElementRelation> collectionElementRelationListNew = new ArrayList<>();
         for (CollectionElement element : collectionElementListOld) {