diff --git a/cmd/internal/dao/artistinfo_artwork.go b/cmd/internal/dao/artistinfo_artwork.go index d4c1ca4..22eaa3b 100644 --- a/cmd/internal/dao/artistinfo_artwork.go +++ b/cmd/internal/dao/artistinfo_artwork.go @@ -148,7 +148,13 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest) tx = tx.Where("supplement_audit_status = 4").Order("lock_time desc") } if req.BaseAuditStatus != 0 { - tx = tx.Where("base_audit_status = ?", req.BaseAuditStatus) + if req.BaseAuditStatus == 2 { + //现要求暂存的画作也支持在待审核列表展示和审批 + tx = tx.Where("base_audit_status = ? OR base_audit_status =1", req.BaseAuditStatus) + } else { + tx = tx.Where("base_audit_status = ?", req.BaseAuditStatus) + } + } if req.SupplementAuditStatus != 0 { tx = tx.Where("supplement_audit_status = ?", req.SupplementAuditStatus) diff --git a/pb/artistInfoArtwork/artistinfoArtwork.pb.go b/pb/artistInfoArtwork/artistinfoArtwork.pb.go index 10847fe..bbd9c53 100644 --- a/pb/artistInfoArtwork/artistinfoArtwork.pb.go +++ b/pb/artistInfoArtwork/artistinfoArtwork.pb.go @@ -363,7 +363,7 @@ type GetArtworkLockRecordsRequest struct { unknownFields protoimpl.UnknownFields ArtistUid string `protobuf:"bytes,1,opt,name=artistUid,proto3" json:"artistUid,omitempty"` //画家uid - QueryType ArtworkQueryMode `protobuf:"varint,2,opt,name=queryType,proto3,enum=artistinfo.ArtworkQueryMode" json:"queryType,omitempty"` //查询模式 + QueryType ArtworkQueryMode `protobuf:"varint,2,opt,name=queryType,proto3,enum=artistinfo.ArtworkQueryMode" json:"queryType,omitempty"` //查询模式 BaseAuditStatus int64 `protobuf:"varint,3,opt,name=baseAuditStatus,proto3" json:"baseAuditStatus,omitempty"` //基本信息审批状态 可选 SupplementAuditStatus int64 `protobuf:"varint,4,opt,name=supplementAuditStatus,proto3" json:"supplementAuditStatus,omitempty"` //基本信息审批状态 可选 ArtworkUids []string `protobuf:"bytes,5,rep,name=artworkUids,proto3" json:"artworkUids,omitempty"` //画作uid列表 diff --git a/pb/artistinfoArtwork.proto b/pb/artistinfoArtwork.proto index 2f04485..90cab69 100644 --- a/pb/artistinfoArtwork.proto +++ b/pb/artistinfoArtwork.proto @@ -56,7 +56,7 @@ enum ArtworkQueryMode { message GetArtworkLockRecordsRequest{ string artistUid =1 [(validate.rules).message.required = true];//画家uid ArtworkQueryMode queryType =2 ; //查询模式 - int64 baseAuditStatus =3; //基本信息审批状态 可选 + int64 baseAuditStatus =3; //基本信息审批状态 可选 1:暂存 2:待审核 3:审核不通过 4:审核通过 int64 supplementAuditStatus =4; //基本信息审批状态 可选 repeated string artworkUids=5; //画作uid列表 int64 page=6;