From b2844379fb1b88edc79d3e55307d90d16b2d1748 Mon Sep 17 00:00:00 2001
From: jjxu <428192774@qq.com>
Date: Sat, 1 Apr 2023 09:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=8E=86=E5=8F=B2=E7=94=BB?=
 =?UTF-8?q?=E4=BD=9C=E8=81=94=E5=8A=A8=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=8F=90=E4=BE=9B=E5=A4=87=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/logic/artistinfo_artwork.go | 59 +++++++++++++-----------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go
index efc0969..a5d7a94 100644
--- a/cmd/internal/logic/artistinfo_artwork.go
+++ b/cmd/internal/logic/artistinfo_artwork.go
@@ -134,6 +134,7 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 				DataList:  make([]*artistInfoArtwork.ArtworkPreviewInfo, 0),
 			})
 		}
+		//// 方案1： 画作在画作系统被删除了，继续展示，只是数据只有artowrkUid，其它的都没了，查询详情会报错not found
 		var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{
 			ArtistUuid:            v.ArtistUid,
 			ArtworkUid:            v.ArtworkUid,
@@ -160,35 +161,41 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 				thisArtwork.HdPic = artwork.HdPic
 				thisArtwork.ArtworkUid = artwork.ArtworkUid
 				thisArtwork.CreatedDate = artwork.CreateDate
-
-				// res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
-				// 	ArtistUuid:            artwork.ArtistUuid,
-				// 	ArtworkName:           artwork.ArtworkName,
-				// 	Length:                artwork.Length,
-				// 	Width:                 artwork.Width,
-				// 	Ruler:                 artwork.Ruler,
-				// 	CreatedAddress:        strings.Split(artwork.CreatedAddress, "，"),
-				// 	ArtistPhoto:           artwork.ArtistPhoto,
-				// 	HdPic:                 artwork.HdPic,
-				// 	ArtworkUid:            artwork.ArtworkUid,
-				// 	CreatedDate:           artwork.CreateDate,
-				// 	LockStatus:            int32(v.Status),
-				// 	BaseAuditStatus:       v.BaseAuditStatus,
-				// 	BaseAuditMark:         v.BaseAuditMark,
-				// 	BaseAuditMark2:        v.BaseAuditMark2,
-				// 	SupplementAuditStatus: v.SupplementAuditStatus,
-				// 	SupplementAuditMark:   v.SupplementAuditMark,
-				// 	SupplementAuditMark2:  v.SupplementAuditMark2,
-				// 	AuditFlowIndex:        v.AuditFlowIndex,
-				// 	CreatedAt:             v.CreatedAt,
-				// 	UpdatedAt:             v.UpdatedAt,
-				// 	DeletedAt:             v.DeletedAt,
-				// })
-
+				break
 			}
 		}
 		res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork)
-	}
+
+		//// 方案2：画作如果被画作系统删除，则不展示被删除的内容
+	// 	for _, artwork := range previewListRes.Data {
+	// 		if artwork.ArtworkUid == v.ArtworkUid {
+	// 			res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
+	// 				ArtworkName:           artwork.ArtworkName,
+	// 				Length:                artwork.Length,
+	// 				Width:                 artwork.Width,
+	// 				Ruler:                 artwork.Ruler,
+	// 				CreatedAddress:        strings.Split(artwork.CreatedAddress, "，"),
+	// 				ArtistPhoto:           artwork.ArtistPhoto,
+	// 				HdPic:                 artwork.HdPic,
+	// 				CreatedDate:           artwork.CreateDate,
+	// 				LockStatus:            int32(v.Status),
+	// 				ArtistUuid:            v.ArtistUid,
+	// 				ArtworkUid:            v.ArtworkUid,
+	// 				BaseAuditStatus:       v.BaseAuditStatus,
+	// 				BaseAuditMark:         v.BaseAuditMark,
+	// 				BaseAuditMark2:        v.BaseAuditMark2,
+	// 				SupplementAuditStatus: v.SupplementAuditStatus,
+	// 				SupplementAuditMark:   v.SupplementAuditMark,
+	// 				SupplementAuditMark2:  v.SupplementAuditMark2,
+	// 				AuditFlowIndex:        v.AuditFlowIndex,
+	// 				CreatedAt:             v.CreatedAt,
+	// 				UpdatedAt:             v.UpdatedAt,
+	// 				DeletedAt:             v.DeletedAt,
+	// 			})
+	// 			break
+	// 		}
+	// 	}
+	// }
 	fmt.Println("previewListRes count", len(previewListRes.Data))
 	return
 }