Merge branch 'xjjdev'

This commit is contained in:
徐俊杰 2023-04-01 10:00:16 +08:00
commit 0847107720

View File

@ -167,36 +167,36 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork) res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, thisArtwork)
//// 方案2画作如果被画作系统删除则不展示被删除的内容 //// 方案2画作如果被画作系统删除则不展示被删除的内容
// for _, artwork := range previewListRes.Data { // for _, artwork := range previewListRes.Data {
// if artwork.ArtworkUid == v.ArtworkUid { // if artwork.ArtworkUid == v.ArtworkUid {
// res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ // res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
// ArtworkName: artwork.ArtworkName, // ArtworkName: artwork.ArtworkName,
// Length: artwork.Length, // Length: artwork.Length,
// Width: artwork.Width, // Width: artwork.Width,
// Ruler: artwork.Ruler, // Ruler: artwork.Ruler,
// CreatedAddress: strings.Split(artwork.CreatedAddress, ""), // CreatedAddress: strings.Split(artwork.CreatedAddress, ""),
// ArtistPhoto: artwork.ArtistPhoto, // ArtistPhoto: artwork.ArtistPhoto,
// HdPic: artwork.HdPic, // HdPic: artwork.HdPic,
// CreatedDate: artwork.CreateDate, // CreatedDate: artwork.CreateDate,
// LockStatus: int32(v.Status), // LockStatus: int32(v.Status),
// ArtistUuid: v.ArtistUid, // ArtistUuid: v.ArtistUid,
// ArtworkUid: v.ArtworkUid, // ArtworkUid: v.ArtworkUid,
// BaseAuditStatus: v.BaseAuditStatus, // BaseAuditStatus: v.BaseAuditStatus,
// BaseAuditMark: v.BaseAuditMark, // BaseAuditMark: v.BaseAuditMark,
// BaseAuditMark2: v.BaseAuditMark2, // BaseAuditMark2: v.BaseAuditMark2,
// SupplementAuditStatus: v.SupplementAuditStatus, // SupplementAuditStatus: v.SupplementAuditStatus,
// SupplementAuditMark: v.SupplementAuditMark, // SupplementAuditMark: v.SupplementAuditMark,
// SupplementAuditMark2: v.SupplementAuditMark2, // SupplementAuditMark2: v.SupplementAuditMark2,
// AuditFlowIndex: v.AuditFlowIndex, // AuditFlowIndex: v.AuditFlowIndex,
// CreatedAt: v.CreatedAt, // CreatedAt: v.CreatedAt,
// UpdatedAt: v.UpdatedAt, // UpdatedAt: v.UpdatedAt,
// DeletedAt: v.DeletedAt, // DeletedAt: v.DeletedAt,
// }) // })
// break // break
// } // }
// } // }
// } // }
fmt.Println("previewListRes count", len(previewListRes.Data)) }
return return
} }