diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go index b53ec60..61d660a 100644 --- a/cmd/internal/logic/artistinfo_artwork.go +++ b/cmd/internal/logic/artistinfo_artwork.go @@ -135,67 +135,66 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr }) } //// 方案1: 画作在画作系统被删除了,继续展示,只是数据只有artowrkUid,其它的都没了,查询详情会报错not found - var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ - ArtistUuid: v.ArtistUid, - ArtworkUid: v.ArtworkUid, - 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, - } + // var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ + // ArtistUuid: v.ArtistUid, + // ArtworkUid: v.ArtworkUid, + // 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, + // } + // for _, artwork := range previewListRes.Data { + // if artwork.ArtworkUid == v.ArtworkUid { + // thisArtwork.ArtworkName = artwork.ArtworkName + // thisArtwork.Length = artwork.Length + // thisArtwork.Width = artwork.Width + // thisArtwork.Ruler = artwork.Ruler + // thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, ",") + // thisArtwork.ArtistPhoto = artwork.ArtistPhoto + // thisArtwork.HdPic = artwork.HdPic + // thisArtwork.ArtworkUid = artwork.ArtworkUid + // thisArtwork.CreatedDate = artwork.CreateDate + // break + // } + // } + // res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork) + + //// 方案2:画作如果被画作系统删除,则不展示被删除的内容 for _, artwork := range previewListRes.Data { if artwork.ArtworkUid == v.ArtworkUid { - thisArtwork.ArtworkName = artwork.ArtworkName - thisArtwork.Length = artwork.Length - thisArtwork.Width = artwork.Width - thisArtwork.Ruler = artwork.Ruler - thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, ",") - thisArtwork.ArtistPhoto = artwork.ArtistPhoto - thisArtwork.HdPic = artwork.HdPic - thisArtwork.ArtworkUid = artwork.ArtworkUid - thisArtwork.CreatedDate = artwork.CreateDate + 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 } } - 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 - // } - // } - // } } return }