Merge branch 'xjjdev'
This commit is contained in:
commit
961c6dfbee
@ -136,29 +136,32 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
for _, artwork := range previewListRes.Data {
|
for _, artwork := range previewListRes.Data {
|
||||||
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
|
if artwork.ArtworkUid == v.ArtworkUid {
|
||||||
ArtistUuid: artwork.ArtistUuid,
|
res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{
|
||||||
ArtworkName: artwork.ArtworkName,
|
ArtistUuid: artwork.ArtistUuid,
|
||||||
Length: artwork.Length,
|
ArtworkName: artwork.ArtworkName,
|
||||||
Width: artwork.Width,
|
Length: artwork.Length,
|
||||||
Ruler: artwork.Ruler,
|
Width: artwork.Width,
|
||||||
CreatedAddress: strings.Split(artwork.CreatedAddress, ","),
|
Ruler: artwork.Ruler,
|
||||||
ArtistPhoto: artwork.ArtistPhoto,
|
CreatedAddress: strings.Split(artwork.CreatedAddress, ","),
|
||||||
HdPic: artwork.HdPic,
|
ArtistPhoto: artwork.ArtistPhoto,
|
||||||
ArtworkUid: artwork.ArtworkUid,
|
HdPic: artwork.HdPic,
|
||||||
CreatedDate: artwork.CreateDate,
|
ArtworkUid: artwork.ArtworkUid,
|
||||||
LockStatus: int32(v.Status),
|
CreatedDate: artwork.CreateDate,
|
||||||
BaseAuditStatus: v.BaseAuditStatus,
|
LockStatus: int32(v.Status),
|
||||||
BaseAuditMark: v.BaseAuditMark,
|
BaseAuditStatus: v.BaseAuditStatus,
|
||||||
BaseAuditMark2: v.BaseAuditMark2,
|
BaseAuditMark: v.BaseAuditMark,
|
||||||
SupplementAuditStatus: v.SupplementAuditStatus,
|
BaseAuditMark2: v.BaseAuditMark2,
|
||||||
SupplementAuditMark: v.SupplementAuditMark,
|
SupplementAuditStatus: v.SupplementAuditStatus,
|
||||||
SupplementAuditMark2: v.SupplementAuditMark2,
|
SupplementAuditMark: v.SupplementAuditMark,
|
||||||
AuditFlowIndex: v.AuditFlowIndex,
|
SupplementAuditMark2: v.SupplementAuditMark2,
|
||||||
CreatedAt: v.CreatedAt,
|
AuditFlowIndex: v.AuditFlowIndex,
|
||||||
UpdatedAt: v.UpdatedAt,
|
CreatedAt: v.CreatedAt,
|
||||||
DeletedAt: v.DeletedAt,
|
UpdatedAt: v.UpdatedAt,
|
||||||
})
|
DeletedAt: v.DeletedAt,
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fmt.Println("previewListRes count", len(previewListRes.Data))
|
fmt.Println("previewListRes count", len(previewListRes.Data))
|
||||||
|
Loading…
Reference in New Issue
Block a user